mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 11:39:53 +00:00
libqos: Add virtio MMIO support
Add virtio MMIO support. Add virtio-blk-test MMIO test case. Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1424812915-25728-6-git-send-email-marc.mari.barcelo@gmail.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
870a306dec
commit
0a6ed70006
@ -191,6 +191,8 @@ gcov-files-sparc-y += hw/timer/m48t59.c
|
||||
gcov-files-sparc64-y += hw/timer/m48t59.c
|
||||
check-qtest-arm-y = tests/tmp105-test$(EXESUF)
|
||||
gcov-files-arm-y += hw/misc/tmp105.c
|
||||
check-qtest-arm-y += tests/virtio-blk-test$(EXESUF)
|
||||
gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
|
||||
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
||||
check-qtest-ppc64-y += tests/boot-order-test$(EXESUF)
|
||||
check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
|
||||
@ -315,8 +317,8 @@ libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
|
||||
libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o
|
||||
libqos-pc-obj-y += tests/libqos/ahci.o
|
||||
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
|
||||
libqos-virtio-obj-y = $(libqos-obj-y) $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o
|
||||
libqos-usb-obj-y = $(libqos-pc-obj-y) tests/libqos/usb.o
|
||||
libqos-virtio-obj-y = $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/libqos/malloc-generic.o
|
||||
|
||||
tests/rtc-test$(EXESUF): tests/rtc-test.o
|
||||
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
||||
|
198
tests/libqos/virtio-mmio.c
Normal file
198
tests/libqos/virtio-mmio.c
Normal file
@ -0,0 +1,198 @@
|
||||
/*
|
||||
* libqos virtio MMIO driver
|
||||
*
|
||||
* Copyright (c) 2014 Marc Marí
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include "libqtest.h"
|
||||
#include "libqos/virtio.h"
|
||||
#include "libqos/virtio-mmio.h"
|
||||
#include "libqos/malloc.h"
|
||||
#include "libqos/malloc-generic.h"
|
||||
|
||||
static uint8_t qvirtio_mmio_config_readb(QVirtioDevice *d, uint64_t addr)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return readb(dev->addr + addr);
|
||||
}
|
||||
|
||||
static uint16_t qvirtio_mmio_config_readw(QVirtioDevice *d, uint64_t addr)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return readw(dev->addr + addr);
|
||||
}
|
||||
|
||||
static uint32_t qvirtio_mmio_config_readl(QVirtioDevice *d, uint64_t addr)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return readl(dev->addr + addr);
|
||||
}
|
||||
|
||||
static uint64_t qvirtio_mmio_config_readq(QVirtioDevice *d, uint64_t addr)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return readq(dev->addr + addr);
|
||||
}
|
||||
|
||||
static uint32_t qvirtio_mmio_get_features(QVirtioDevice *d)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
writel(dev->addr + QVIRTIO_MMIO_HOST_FEATURES_SEL, 0);
|
||||
return readl(dev->addr + QVIRTIO_MMIO_HOST_FEATURES);
|
||||
}
|
||||
|
||||
static void qvirtio_mmio_set_features(QVirtioDevice *d, uint32_t features)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
dev->features = features;
|
||||
writel(dev->addr + QVIRTIO_MMIO_GUEST_FEATURES_SEL, 0);
|
||||
writel(dev->addr + QVIRTIO_MMIO_GUEST_FEATURES, features);
|
||||
}
|
||||
|
||||
static uint32_t qvirtio_mmio_get_guest_features(QVirtioDevice *d)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return dev->features;
|
||||
}
|
||||
|
||||
static uint8_t qvirtio_mmio_get_status(QVirtioDevice *d)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return (uint8_t)readl(dev->addr + QVIRTIO_MMIO_DEVICE_STATUS);
|
||||
}
|
||||
|
||||
static void qvirtio_mmio_set_status(QVirtioDevice *d, uint8_t status)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
writel(dev->addr + QVIRTIO_MMIO_DEVICE_STATUS, (uint32_t)status);
|
||||
}
|
||||
|
||||
static bool qvirtio_mmio_get_queue_isr_status(QVirtioDevice *d, QVirtQueue *vq)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
uint32_t isr;
|
||||
|
||||
isr = readl(dev->addr + QVIRTIO_MMIO_INTERRUPT_STATUS) & 1;
|
||||
if (isr != 0) {
|
||||
writel(dev->addr + QVIRTIO_MMIO_INTERRUPT_ACK, 1);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool qvirtio_mmio_get_config_isr_status(QVirtioDevice *d)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
uint32_t isr;
|
||||
|
||||
isr = readl(dev->addr + QVIRTIO_MMIO_INTERRUPT_STATUS) & 2;
|
||||
if (isr != 0) {
|
||||
writel(dev->addr + QVIRTIO_MMIO_INTERRUPT_ACK, 2);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static void qvirtio_mmio_queue_select(QVirtioDevice *d, uint16_t index)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
writel(dev->addr + QVIRTIO_MMIO_QUEUE_SEL, (uint32_t)index);
|
||||
|
||||
g_assert_cmphex(readl(dev->addr + QVIRTIO_MMIO_QUEUE_PFN), ==, 0);
|
||||
}
|
||||
|
||||
static uint16_t qvirtio_mmio_get_queue_size(QVirtioDevice *d)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
return (uint16_t)readl(dev->addr + QVIRTIO_MMIO_QUEUE_NUM_MAX);
|
||||
}
|
||||
|
||||
static void qvirtio_mmio_set_queue_address(QVirtioDevice *d, uint32_t pfn)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
writel(dev->addr + QVIRTIO_MMIO_QUEUE_PFN, pfn);
|
||||
}
|
||||
|
||||
static QVirtQueue *qvirtio_mmio_virtqueue_setup(QVirtioDevice *d,
|
||||
QGuestAllocator *alloc, uint16_t index)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
QVirtQueue *vq;
|
||||
uint64_t addr;
|
||||
|
||||
vq = g_malloc0(sizeof(*vq));
|
||||
qvirtio_mmio_queue_select(d, index);
|
||||
writel(dev->addr + QVIRTIO_MMIO_QUEUE_ALIGN, dev->page_size);
|
||||
|
||||
vq->index = index;
|
||||
vq->size = qvirtio_mmio_get_queue_size(d);
|
||||
vq->free_head = 0;
|
||||
vq->num_free = vq->size;
|
||||
vq->align = dev->page_size;
|
||||
vq->indirect = (dev->features & QVIRTIO_F_RING_INDIRECT_DESC) != 0;
|
||||
vq->event = (dev->features & QVIRTIO_F_RING_EVENT_IDX) != 0;
|
||||
|
||||
writel(dev->addr + QVIRTIO_MMIO_QUEUE_NUM, vq->size);
|
||||
|
||||
/* Check different than 0 */
|
||||
g_assert_cmpint(vq->size, !=, 0);
|
||||
|
||||
/* Check power of 2 */
|
||||
g_assert_cmpint(vq->size & (vq->size - 1), ==, 0);
|
||||
|
||||
addr = guest_alloc(alloc, qvring_size(vq->size, dev->page_size));
|
||||
qvring_init(alloc, vq, addr);
|
||||
qvirtio_mmio_set_queue_address(d, vq->desc / dev->page_size);
|
||||
|
||||
return vq;
|
||||
}
|
||||
|
||||
static void qvirtio_mmio_virtqueue_kick(QVirtioDevice *d, QVirtQueue *vq)
|
||||
{
|
||||
QVirtioMMIODevice *dev = (QVirtioMMIODevice *)d;
|
||||
writel(dev->addr + QVIRTIO_MMIO_QUEUE_NOTIFY, vq->index);
|
||||
}
|
||||
|
||||
const QVirtioBus qvirtio_mmio = {
|
||||
.config_readb = qvirtio_mmio_config_readb,
|
||||
.config_readw = qvirtio_mmio_config_readw,
|
||||
.config_readl = qvirtio_mmio_config_readl,
|
||||
.config_readq = qvirtio_mmio_config_readq,
|
||||
.get_features = qvirtio_mmio_get_features,
|
||||
.set_features = qvirtio_mmio_set_features,
|
||||
.get_guest_features = qvirtio_mmio_get_guest_features,
|
||||
.get_status = qvirtio_mmio_get_status,
|
||||
.set_status = qvirtio_mmio_set_status,
|
||||
.get_queue_isr_status = qvirtio_mmio_get_queue_isr_status,
|
||||
.get_config_isr_status = qvirtio_mmio_get_config_isr_status,
|
||||
.queue_select = qvirtio_mmio_queue_select,
|
||||
.get_queue_size = qvirtio_mmio_get_queue_size,
|
||||
.set_queue_address = qvirtio_mmio_set_queue_address,
|
||||
.virtqueue_setup = qvirtio_mmio_virtqueue_setup,
|
||||
.virtqueue_kick = qvirtio_mmio_virtqueue_kick,
|
||||
};
|
||||
|
||||
QVirtioMMIODevice *qvirtio_mmio_init_device(uint64_t addr, uint32_t page_size)
|
||||
{
|
||||
QVirtioMMIODevice *dev;
|
||||
uint32_t magic;
|
||||
dev = g_malloc0(sizeof(*dev));
|
||||
|
||||
magic = readl(addr + QVIRTIO_MMIO_MAGIC_VALUE);
|
||||
g_assert(magic == ('v' | 'i' << 8 | 'r' << 16 | 't' << 24));
|
||||
|
||||
dev->addr = addr;
|
||||
dev->page_size = page_size;
|
||||
dev->vdev.device_type = readl(addr + QVIRTIO_MMIO_DEVICE_ID);
|
||||
|
||||
writel(addr + QVIRTIO_MMIO_GUEST_PAGE_SIZE, page_size);
|
||||
|
||||
return dev;
|
||||
}
|
46
tests/libqos/virtio-mmio.h
Normal file
46
tests/libqos/virtio-mmio.h
Normal file
@ -0,0 +1,46 @@
|
||||
/*
|
||||
* libqos virtio MMIO definitions
|
||||
*
|
||||
* Copyright (c) 2014 Marc Marí
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#ifndef LIBQOS_VIRTIO_MMIO_H
|
||||
#define LIBQOS_VIRTIO_MMIO_H
|
||||
|
||||
#include "libqos/virtio.h"
|
||||
|
||||
#define QVIRTIO_MMIO_MAGIC_VALUE 0x000
|
||||
#define QVIRTIO_MMIO_VERSION 0x004
|
||||
#define QVIRTIO_MMIO_DEVICE_ID 0x008
|
||||
#define QVIRTIO_MMIO_VENDOR_ID 0x00C
|
||||
#define QVIRTIO_MMIO_HOST_FEATURES 0x010
|
||||
#define QVIRTIO_MMIO_HOST_FEATURES_SEL 0x014
|
||||
#define QVIRTIO_MMIO_GUEST_FEATURES 0x020
|
||||
#define QVIRTIO_MMIO_GUEST_FEATURES_SEL 0x024
|
||||
#define QVIRTIO_MMIO_GUEST_PAGE_SIZE 0x028
|
||||
#define QVIRTIO_MMIO_QUEUE_SEL 0x030
|
||||
#define QVIRTIO_MMIO_QUEUE_NUM_MAX 0x034
|
||||
#define QVIRTIO_MMIO_QUEUE_NUM 0x038
|
||||
#define QVIRTIO_MMIO_QUEUE_ALIGN 0x03C
|
||||
#define QVIRTIO_MMIO_QUEUE_PFN 0x040
|
||||
#define QVIRTIO_MMIO_QUEUE_NOTIFY 0x050
|
||||
#define QVIRTIO_MMIO_INTERRUPT_STATUS 0x060
|
||||
#define QVIRTIO_MMIO_INTERRUPT_ACK 0x064
|
||||
#define QVIRTIO_MMIO_DEVICE_STATUS 0x070
|
||||
#define QVIRTIO_MMIO_DEVICE_SPECIFIC 0x100
|
||||
|
||||
typedef struct QVirtioMMIODevice {
|
||||
QVirtioDevice vdev;
|
||||
uint64_t addr;
|
||||
uint32_t page_size;
|
||||
uint32_t features; /* As it cannot be read later, save it */
|
||||
} QVirtioMMIODevice;
|
||||
|
||||
extern const QVirtioBus qvirtio_mmio;
|
||||
|
||||
QVirtioMMIODevice *qvirtio_mmio_init_device(uint64_t addr, uint32_t page_size);
|
||||
|
||||
#endif
|
@ -16,9 +16,11 @@
|
||||
#include "libqtest.h"
|
||||
#include "libqos/virtio.h"
|
||||
#include "libqos/virtio-pci.h"
|
||||
#include "libqos/virtio-mmio.h"
|
||||
#include "libqos/pci-pc.h"
|
||||
#include "libqos/malloc.h"
|
||||
#include "libqos/malloc-pc.h"
|
||||
#include "libqos/malloc-generic.h"
|
||||
#include "qemu/bswap.h"
|
||||
|
||||
#define QVIRTIO_BLK_F_BARRIER 0x00000001
|
||||
@ -42,10 +44,14 @@
|
||||
|
||||
#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
|
||||
#define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000)
|
||||
#define PCI_SLOT_HP 0x06
|
||||
#define PCI_SLOT 0x04
|
||||
#define PCI_FN 0x00
|
||||
|
||||
#define PCI_SLOT_HP 0x06
|
||||
#define MMIO_PAGE_SIZE 4096
|
||||
#define MMIO_DEV_BASE_ADDR 0x0A003E00
|
||||
#define MMIO_RAM_ADDR 0x40000000
|
||||
#define MMIO_RAM_SIZE 0x20000000
|
||||
|
||||
typedef struct QVirtioBlkReq {
|
||||
uint32_t type;
|
||||
@ -90,6 +96,23 @@ static QPCIBus *pci_test_start(void)
|
||||
return qpci_init_pc();
|
||||
}
|
||||
|
||||
static void arm_test_start(void)
|
||||
{
|
||||
char *cmdline;
|
||||
char *tmp_path;
|
||||
|
||||
tmp_path = drive_create();
|
||||
|
||||
cmdline = g_strdup_printf("-machine virt "
|
||||
"-drive if=none,id=drive0,file=%s,format=raw "
|
||||
"-device virtio-blk-device,drive=drive0",
|
||||
tmp_path);
|
||||
qtest_start(cmdline);
|
||||
unlink(tmp_path);
|
||||
g_free(tmp_path);
|
||||
g_free(cmdline);
|
||||
}
|
||||
|
||||
static void test_end(void)
|
||||
{
|
||||
qtest_end();
|
||||
@ -695,18 +718,64 @@ static void pci_hotplug(void)
|
||||
test_end();
|
||||
}
|
||||
|
||||
static void mmio_basic(void)
|
||||
{
|
||||
QVirtioMMIODevice *dev;
|
||||
QVirtQueue *vq;
|
||||
QGuestAllocator *alloc;
|
||||
int n_size = TEST_IMAGE_SIZE / 2;
|
||||
uint64_t capacity;
|
||||
|
||||
arm_test_start();
|
||||
|
||||
dev = qvirtio_mmio_init_device(MMIO_DEV_BASE_ADDR, MMIO_PAGE_SIZE);
|
||||
g_assert(dev != NULL);
|
||||
g_assert_cmphex(dev->vdev.device_type, ==, QVIRTIO_BLK_DEVICE_ID);
|
||||
|
||||
qvirtio_reset(&qvirtio_mmio, &dev->vdev);
|
||||
qvirtio_set_acknowledge(&qvirtio_mmio, &dev->vdev);
|
||||
qvirtio_set_driver(&qvirtio_mmio, &dev->vdev);
|
||||
|
||||
alloc = generic_alloc_init(MMIO_RAM_ADDR, MMIO_RAM_SIZE, MMIO_PAGE_SIZE);
|
||||
vq = qvirtqueue_setup(&qvirtio_mmio, &dev->vdev, alloc, 0);
|
||||
|
||||
test_basic(&qvirtio_mmio, &dev->vdev, alloc, vq,
|
||||
QVIRTIO_MMIO_DEVICE_SPECIFIC);
|
||||
|
||||
qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0', "
|
||||
" 'size': %d } }", n_size);
|
||||
|
||||
qvirtio_wait_queue_isr(&qvirtio_mmio, &dev->vdev, vq,
|
||||
QVIRTIO_BLK_TIMEOUT_US);
|
||||
|
||||
capacity = qvirtio_config_readq(&qvirtio_mmio, &dev->vdev,
|
||||
QVIRTIO_MMIO_DEVICE_SPECIFIC);
|
||||
g_assert_cmpint(capacity, ==, n_size / 512);
|
||||
|
||||
/* End test */
|
||||
guest_free(alloc, vq->desc);
|
||||
generic_alloc_uninit(alloc);
|
||||
g_free(dev);
|
||||
test_end();
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int ret;
|
||||
const char *arch = qtest_get_arch();
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
g_test_add_func("/virtio/blk/pci/basic", pci_basic);
|
||||
g_test_add_func("/virtio/blk/pci/indirect", pci_indirect);
|
||||
g_test_add_func("/virtio/blk/pci/config", pci_config);
|
||||
g_test_add_func("/virtio/blk/pci/msix", pci_msix);
|
||||
g_test_add_func("/virtio/blk/pci/idx", pci_idx);
|
||||
g_test_add_func("/virtio/blk/pci/hotplug", pci_hotplug);
|
||||
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
||||
qtest_add_func("/virtio/blk/pci/basic", pci_basic);
|
||||
qtest_add_func("/virtio/blk/pci/indirect", pci_indirect);
|
||||
qtest_add_func("/virtio/blk/pci/config", pci_config);
|
||||
qtest_add_func("/virtio/blk/pci/msix", pci_msix);
|
||||
qtest_add_func("/virtio/blk/pci/idx", pci_idx);
|
||||
qtest_add_func("/virtio/blk/pci/hotplug", pci_hotplug);
|
||||
} else if (strcmp(arch, "arm") == 0) {
|
||||
qtest_add_func("/virtio/blk/mmio/basic", mmio_basic);
|
||||
}
|
||||
|
||||
ret = g_test_run();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user