Author: neel
Date: Tue Feb 18 19:00:15 2014
New Revision: 262184
URL: http://svnweb.freebsd.org/changeset/base/262184
Log:
Add a check to validate that memory BARs of passthru devices are 4KB aligned.
Also, the MSI-x table offset is not required to be 4KB aligned so take this
into account when computing the pages occupied by the MSI-x tables.
Modified:
head/usr.sbin/bhyve/pci_emul.c
head/usr.sbin/bhyve/pci_emul.h
head/usr.sbin/bhyve/pci_passthru.c
Modified: head/usr.sbin/bhyve/pci_emul.c
==============================================================================
--- head/usr.sbin/bhyve/pci_emul.c Tue Feb 18 16:26:18 2014
(r262183)
+++ head/usr.sbin/bhyve/pci_emul.c Tue Feb 18 19:00:15 2014
(r262184)
@@ -792,7 +792,6 @@ pci_msix_table_init(struct pci_devinst *
int
pci_emul_add_msixcap(struct pci_devinst *pi, int msgnum, int barnum)
{
- uint16_t pba_index;
uint32_t tab_size;
struct msixcap msixcap;
@@ -809,10 +808,7 @@ pci_emul_add_msixcap(struct pci_devinst
pi->pi_msix.table_offset = 0;
pi->pi_msix.table_count = msgnum;
pi->pi_msix.pba_offset = tab_size;
-
- /* calculate the MMIO size required for MSI-X PBA */
- pba_index = (msgnum - 1) / (PBA_TABLE_ENTRY_SIZE * 8);
- pi->pi_msix.pba_size = (pba_index + 1) * PBA_TABLE_ENTRY_SIZE;
+ pi->pi_msix.pba_size = PBA_SIZE(msgnum);
pci_msix_table_init(pi, msgnum);
Modified: head/usr.sbin/bhyve/pci_emul.h
==============================================================================
--- head/usr.sbin/bhyve/pci_emul.h Tue Feb 18 16:26:18 2014
(r262183)
+++ head/usr.sbin/bhyve/pci_emul.h Tue Feb 18 19:00:15 2014
(r262184)
@@ -100,7 +100,7 @@ struct msix_table_entry {
*/
#define MSIX_TABLE_ENTRY_SIZE 16
#define MAX_MSIX_TABLE_ENTRIES 2048
-#define PBA_TABLE_ENTRY_SIZE 8
+#define PBA_SIZE(msgnum) (roundup2((msgnum), 64) / 8)
enum lintr_stat {
IDLE,
@@ -135,10 +135,10 @@ struct pci_devinst {
int enabled;
int table_bar;
int pba_bar;
- size_t table_offset;
+ uint32_t table_offset;
int table_count;
- size_t pba_offset;
- size_t pba_size;
+ uint32_t pba_offset;
+ int pba_size;
int function_mask;
struct msix_table_entry *table; /* allocated at runtime */
} pi_msix;
Modified: head/usr.sbin/bhyve/pci_passthru.c
==============================================================================
--- head/usr.sbin/bhyve/pci_passthru.c Tue Feb 18 16:26:18 2014
(r262183)
+++ head/usr.sbin/bhyve/pci_passthru.c Tue Feb 18 19:00:15 2014
(r262184)
@@ -228,6 +228,7 @@ cfginitmsi(struct passthru_softc *sc)
pi->pi_msix.table_offset =
msixcap.table_info & ~PCIM_MSIX_BIR_MASK;
pi->pi_msix.table_count = MSIX_TABLE_COUNT(msixcap.msgctrl);
+ pi->pi_msix.pba_size = PBA_SIZE(pi->pi_msix.table_count);
/* Allocate the emulated MSI-X table array */
table_size = pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE;
@@ -279,8 +280,10 @@ msix_table_read(struct passthru_softc *s
int index;
pi = sc->psc_pi;
- offset -= pi->pi_msix.table_offset;
+ if (offset < pi->pi_msix.table_offset)
+ return (-1);
+ offset -= pi->pi_msix.table_offset;
index = offset / MSIX_TABLE_ENTRY_SIZE;
if (index >= pi->pi_msix.table_count)
return (-1);
@@ -324,8 +327,10 @@ msix_table_write(struct vmctx *ctx, int
int error, index;
pi = sc->psc_pi;
- offset -= pi->pi_msix.table_offset;
+ if (offset < pi->pi_msix.table_offset)
+ return;
+ offset -= pi->pi_msix.table_offset;
index = offset / MSIX_TABLE_ENTRY_SIZE;
if (index >= pi->pi_msix.table_count)
return;
@@ -358,7 +363,9 @@ init_msix_table(struct vmctx *ctx, struc
{
int b, s, f;
int error, idx;
- size_t len, remaining, table_size;
+ size_t len, remaining;
+ uint32_t table_size, table_offset;
+ uint32_t pba_size, pba_offset;
vm_paddr_t start;
struct pci_devinst *pi = sc->psc_pi;
@@ -374,24 +381,37 @@ init_msix_table(struct vmctx *ctx, struc
* either resides in its own page within the region,
* or it resides in a page shared with only the PBA.
*/
- if (pi->pi_msix.pba_bar == pi->pi_msix.table_bar &&
- ((pi->pi_msix.pba_offset - pi->pi_msix.table_offset) < 4096)) {
- /* Need to also emulate the PBA, not supported yet */
- printf("Unsupported MSI-X configuration: %d/%d/%d\n", b, s, f);
- return (-1);
- }
+ table_offset = rounddown2(pi->pi_msix.table_offset, 4096);
- /* Compute the MSI-X table size */
- table_size = pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE;
+ table_size = pi->pi_msix.table_offset - table_offset;
+ table_size += pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE;
table_size = roundup2(table_size, 4096);
+ if (pi->pi_msix.pba_bar == pi->pi_msix.table_bar) {
+ pba_offset = pi->pi_msix.pba_offset;
+ pba_size = pi->pi_msix.pba_size;
+ if (pba_offset >= table_offset + table_size ||
+ table_offset >= pba_offset + pba_size) {
+ /*
+ * The PBA can reside in the same BAR as the MSI-x
+ * tables as long as it does not overlap with any
+ * naturally aligned page occupied by the tables.
+ */
+ } else {
+ /* Need to also emulate the PBA, not supported yet */
+ printf("Unsupported MSI-X configuration: %d/%d/%d\n",
+ b, s, f);
+ return (-1);
+ }
+ }
+
idx = pi->pi_msix.table_bar;
start = pi->pi_bar[idx].addr;
remaining = pi->pi_bar[idx].size;
/* Map everything before the MSI-X table */
- if (pi->pi_msix.table_offset > 0) {
- len = pi->pi_msix.table_offset;
+ if (table_offset > 0) {
+ len = table_offset;
error = vm_map_pptdev_mmio(ctx, b, s, f, start, len, base);
if (error)
return (error);
@@ -424,7 +444,7 @@ cfginitbar(struct vmctx *ctx, struct pas
struct pci_devinst *pi;
struct pci_bar_io bar;
enum pcibar_type bartype;
- uint64_t base;
+ uint64_t base, size;
pi = sc->psc_pi;
@@ -453,15 +473,25 @@ cfginitbar(struct vmctx *ctx, struct pas
}
base = bar.pbi_base & PCIM_BAR_MEM_BASE;
}
+ size = bar.pbi_length;
+
+ if (bartype != PCIBAR_IO) {
+ if (((base | size) & PAGE_MASK) != 0) {
+ printf("passthru device %d/%d/%d BAR %d: "
+ "base %#lx or size %#lx not page aligned\n",
+ sc->psc_sel.pc_bus, sc->psc_sel.pc_dev,
+ sc->psc_sel.pc_func, i, base, size);
+ return (-1);
+ }
+ }
/* Cache information about the "real" BAR */
sc->psc_bar[i].type = bartype;
- sc->psc_bar[i].size = bar.pbi_length;
+ sc->psc_bar[i].size = size;
sc->psc_bar[i].addr = base;
/* Allocate the BAR in the guest I/O or MMIO space */
- error = pci_emul_alloc_pbar(pi, i, base, bartype,
- bar.pbi_length);
+ error = pci_emul_alloc_pbar(pi, i, base, bartype, size);
if (error)
return (-1);
@@ -471,7 +501,7 @@ cfginitbar(struct vmctx *ctx, struct pas
if (error)
return (-1);
} else if (bartype != PCIBAR_IO) {
- /* Map the physical MMIO space in the guest MMIO space
*/
+ /* Map the physical BAR in the guest MMIO space */
error = vm_map_pptdev_mmio(ctx, sc->psc_sel.pc_bus,
sc->psc_sel.pc_dev, sc->psc_sel.pc_func,
pi->pi_bar[i].addr, pi->pi_bar[i].size, base);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
