x86/mmcfg: add handlers for the PVH Dom0 MMCFG areas

Introduce a set of handlers for the accesses to the MMCFG areas. Those
areas are setup based on the contents of the hardware MMCFG tables,
and the list of handled MMCFG areas is stored inside of the hvm_domain
struct.

The read/writes are forwarded to the generic vpci handlers once the
address is decoded in order to obtain the device and register the
guest is trying to access.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Roger Pau Monne authored and Jan Beulich committed 2018-03-23 10:18:01 +01:00
1 parent e90580f25b
commit be52cb139f
7 files changed
+225 -5

No files matched your search

+21
View File
@@ -22,6 +22,7 @@
#include <xen/init.h>
#include <xen/libelf.h>
#include <xen/multiboot.h>
#include <xen/pci.h>
#include <xen/softirq.h>
#include <acpi/actables.h>
@@ -1055,6 +1056,24 @@ static int __init pvh_setup_acpi(struct domain *d, paddr_t start_info)
return 0;
}
static void __hwdom_init pvh_setup_mmcfg(struct domain *d)
{
unsigned int i;
int rc;
for ( i = 0; i < pci_mmcfg_config_num; i++ )
{
rc = register_vpci_mmcfg_handler(d, pci_mmcfg_config[i].address,
pci_mmcfg_config[i].start_bus_number,
pci_mmcfg_config[i].end_bus_number,
pci_mmcfg_config[i].pci_segment);
if ( rc )
printk("Unable to setup MMCFG handler at %#lx for segment %u\n",
pci_mmcfg_config[i].address,
pci_mmcfg_config[i].pci_segment);
}
}
int __init dom0_construct_pvh(struct domain *d, const module_t *image,
unsigned long image_headroom,
module_t *initrd,
@@ -1096,6 +1115,8 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image,
return rc;
}
pvh_setup_mmcfg(d);
panic("Building a PVHv2 Dom0 is not yet supported.");
return 0;
}
+4
View File
@@ -584,8 +584,10 @@ int hvm_domain_initialise(struct domain *d)
spin_lock_init(&d->arch.hvm_domain.irq_lock);
spin_lock_init(&d->arch.hvm_domain.uc_lock);
spin_lock_init(&d->arch.hvm_domain.write_map.lock);
rwlock_init(&d->arch.hvm_domain.mmcfg_lock);
INIT_LIST_HEAD(&d->arch.hvm_domain.write_map.list);
INIT_LIST_HEAD(&d->arch.hvm_domain.g2m_ioport_list);
INIT_LIST_HEAD(&d->arch.hvm_domain.mmcfg_regions);
rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL);
if ( rc )
@@ -731,6 +733,8 @@ void hvm_domain_destroy(struct domain *d)
list_del(&ioport->list);
xfree(ioport);
}
destroy_vpci_mmcfg(d);
}
static int hvm_save_tsc_adjust(struct domain *d, hvm_domain_context_t *h)
+183 -1
View File
@@ -283,7 +283,7 @@ unsigned int hvm_pci_decode_addr(unsigned int cf8, unsigned int addr,
static bool vpci_access_allowed(unsigned int reg, unsigned int len)
{
/* Check access size. */
if ( len != 1 && len != 2 && len != 4 )
if ( len != 1 && len != 2 && len != 4 && len != 8 )
return false;
/* Check that access is size aligned. */
@@ -383,6 +383,188 @@ void register_vpci_portio_handler(struct domain *d)
handler->ops = &vpci_portio_ops;
}
struct hvm_mmcfg {
struct list_head next;
paddr_t addr;
unsigned int size;
uint16_t segment;
uint8_t start_bus;
};
/* Handlers to trap PCI MMCFG config accesses. */
static const struct hvm_mmcfg *vpci_mmcfg_find(const struct domain *d,
paddr_t addr)
{
const struct hvm_mmcfg *mmcfg;
list_for_each_entry ( mmcfg, &d->arch.hvm_domain.mmcfg_regions, next )
if ( addr >= mmcfg->addr && addr < mmcfg->addr + mmcfg->size )
return mmcfg;
return NULL;
}
static unsigned int vpci_mmcfg_decode_addr(const struct hvm_mmcfg *mmcfg,
paddr_t addr, pci_sbdf_t *sbdf)
{
addr -= mmcfg->addr;
sbdf->bdf = MMCFG_BDF(addr);
sbdf->bus += mmcfg->start_bus;
sbdf->seg = mmcfg->segment;
return addr & (PCI_CFG_SPACE_EXP_SIZE - 1);
}
static int vpci_mmcfg_accept(struct vcpu *v, unsigned long addr)
{
struct domain *d = v->domain;
bool found;
read_lock(&d->arch.hvm_domain.mmcfg_lock);
found = vpci_mmcfg_find(d, addr);
read_unlock(&d->arch.hvm_domain.mmcfg_lock);
return found;
}
static int vpci_mmcfg_read(struct vcpu *v, unsigned long addr,
unsigned int len, unsigned long *data)
{
struct domain *d = v->domain;
const struct hvm_mmcfg *mmcfg;
unsigned int reg;
pci_sbdf_t sbdf;
*data = ~0ul;
read_lock(&d->arch.hvm_domain.mmcfg_lock);
mmcfg = vpci_mmcfg_find(d, addr);
if ( !mmcfg )
{
read_unlock(&d->arch.hvm_domain.mmcfg_lock);
return X86EMUL_RETRY;
}
reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf);
read_unlock(&d->arch.hvm_domain.mmcfg_lock);
if ( !vpci_access_allowed(reg, len) ||
(reg + len) > PCI_CFG_SPACE_EXP_SIZE )
return X86EMUL_OKAY;
/*
* According to the PCIe 3.1A specification:
* - Configuration Reads and Writes must usually be DWORD or smaller
* in size.
* - Because Root Complex implementations are not required to support
* accesses to a RCRB that cross DW boundaries [...] software
* should take care not to cause the generation of such accesses
* when accessing a RCRB unless the Root Complex will support the
* access.
* Xen however supports 8byte accesses by splitting them into two
* 4byte accesses.
*/
*data = vpci_read(sbdf, reg, min(4u, len));
if ( len == 8 )
*data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32;
return X86EMUL_OKAY;
}
static int vpci_mmcfg_write(struct vcpu *v, unsigned long addr,
unsigned int len, unsigned long data)
{
struct domain *d = v->domain;
const struct hvm_mmcfg *mmcfg;
unsigned int reg;
pci_sbdf_t sbdf;
read_lock(&d->arch.hvm_domain.mmcfg_lock);
mmcfg = vpci_mmcfg_find(d, addr);
if ( !mmcfg )
{
read_unlock(&d->arch.hvm_domain.mmcfg_lock);
return X86EMUL_RETRY;
}
reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf);
read_unlock(&d->arch.hvm_domain.mmcfg_lock);
if ( !vpci_access_allowed(reg, len) ||
(reg + len) > PCI_CFG_SPACE_EXP_SIZE )
return X86EMUL_OKAY;
vpci_write(sbdf, reg, min(4u, len), data);
if ( len == 8 )
vpci_write(sbdf, reg + 4, 4, data >> 32);
return X86EMUL_OKAY;
}
static const struct hvm_mmio_ops vpci_mmcfg_ops = {
.check = vpci_mmcfg_accept,
.read = vpci_mmcfg_read,
.write = vpci_mmcfg_write,
};
int __hwdom_init register_vpci_mmcfg_handler(struct domain *d, paddr_t addr,
unsigned int start_bus,
unsigned int end_bus,
unsigned int seg)
{
struct hvm_mmcfg *mmcfg, *new = xmalloc(struct hvm_mmcfg);
ASSERT(is_hardware_domain(d));
if ( !new )
return -ENOMEM;
if ( start_bus > end_bus )
{
xfree(new);
return -EINVAL;
}
new->addr = addr + (start_bus << 20);
new->start_bus = start_bus;
new->segment = seg;
new->size = (end_bus - start_bus + 1) << 20;
write_lock(&d->arch.hvm_domain.mmcfg_lock);
list_for_each_entry ( mmcfg, &d->arch.hvm_domain.mmcfg_regions, next )
if ( new->addr < mmcfg->addr + mmcfg->size &&
mmcfg->addr < new->addr + new->size )
{
write_unlock(&d->arch.hvm_domain.mmcfg_lock);
xfree(new);
return -EEXIST;
}
if ( list_empty(&d->arch.hvm_domain.mmcfg_regions) )
register_mmio_handler(d, &vpci_mmcfg_ops);
list_add(&new->next, &d->arch.hvm_domain.mmcfg_regions);
write_unlock(&d->arch.hvm_domain.mmcfg_lock);
return 0;
}
void destroy_vpci_mmcfg(struct domain *d)
{
struct list_head *mmcfg_regions = &d->arch.hvm_domain.mmcfg_regions;
write_lock(&d->arch.hvm_domain.mmcfg_lock);
while ( !list_empty(mmcfg_regions) )
{
struct hvm_mmcfg *mmcfg = list_first_entry(mmcfg_regions,
struct hvm_mmcfg, next);
list_del(&mmcfg->next);
xfree(mmcfg);
}
write_unlock(&d->arch.hvm_domain.mmcfg_lock);
}
/*
* Local variables:
* mode: C
-4
View File
@@ -74,10 +74,6 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)
asm volatile("movl %%eax,(%1)" :: "a" (val), "r" (pos) : "memory");
}
/* external variable defines */
extern int pci_mmcfg_config_num;
extern struct acpi_mcfg_allocation *pci_mmcfg_config;
/* function prototypes */
int acpi_parse_mcfg(struct acpi_table_header *header);
int pci_mmcfg_reserved(uint64_t address, unsigned int segment,
+4
View File
@@ -182,6 +182,10 @@ struct hvm_domain {
/* List of guest to machine IO ports mapping. */
struct list_head g2m_ioport_list;
/* List of MMCFG regions trapped by Xen. */
struct list_head mmcfg_regions;
rwlock_t mmcfg_lock;
/* List of permanently write-mapped pages. */
struct {
spinlock_t lock;
+7
View File
@@ -163,6 +163,13 @@ void register_g2m_portio_handler(struct domain *d);
/* HVM port IO handler for vPCI accesses. */
void register_vpci_portio_handler(struct domain *d);
/* HVM MMIO handler for PCI MMCFG accesses. */
int register_vpci_mmcfg_handler(struct domain *d, paddr_t addr,
unsigned int start_bus, unsigned int end_bus,
unsigned int seg);
/* Destroy tracked MMCFG areas. */
void destroy_vpci_mmcfg(struct domain *d);
#endif /* __ASM_X86_HVM_IO_H__ */
+6
View File
@@ -6,6 +6,8 @@
#define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16)
#define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000))
#define MMCFG_BDF(addr) ( ((addr) & 0x0ffff000) >> 12)
#define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \
|| id == 0x01268086 || id == 0x01028086 \
|| id == 0x01128086 || id == 0x01228086 \
@@ -26,4 +28,8 @@ bool_t pci_mmcfg_decode(unsigned long mfn, unsigned int *seg,
bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg,
unsigned int *bdf);
/* MMCFG external variable defines */
extern int pci_mmcfg_config_num;
extern struct acpi_mcfg_allocation *pci_mmcfg_config;
#endif /* __X86_PCI_H__ */
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.