ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Xen 2018/05/22 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJbBGT2AAoJEIlPj0hw4a6Q0BIQAIciEH80ZLPSQPJciRoBCB/s
 1BUsbFelfeHcTXAOxiahmaQbzzffosifK0uJAH5Quy5RotnKknguRgfgAl8nWX34
 vXBbYKOmdudNwk3wIhcnnLfiRvNcdF4yDVVArsnvEbCWUBV2mpTrhuqmepZMiY7s
 GQU42ly09WQePBPFW19RS/kxsaR1lSuGIuSxtc+0QvDQpqMRK3HslHrjD0jgUISh
 pitqL3ztPHpJN1d9KI9fNT066magjnAkWV1gSYH9MAFvWV6JVuXqyJPY/x+YcZEU
 uPgZdEmONIoFqLD7yEHf/kXtCoRZavnvX3t0OPvUOPrN8eeui/UrtOyElY0NxmS/
 RGKggOAjN4VYdAfXHqLIWHkkE8CicFkukr6hk2nyfDKT63ZTR6TfEESrweL3clej
 J2dQ1bPvmAhlPU7tFeo8drAFgeIjLl9QAXEtp2+1FXGYBOT4avwtnt4rrGpnSbpL
 wV6SObd4d8yJR1JrA42jXuL2qlubainlceg4dSFGf84iUx68Sq+DXM+ssbVxs4Tc
 VEJ2nIGK2OF0jafFUV4sqZ7iDQoor0A/SGiOHk8j3kr/kWbidid6opl+MRcr/II3
 CYHyR8IH3LLY/CY18ppVbuCNxovPTilwRsleNy6ZxM1uFeWIOGWUy0WutPTi8wq8
 Ksa1MVPftDaMOLL2WE5C
 =e+YI
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/sstabellini-http/tags/xen-20180522-tag' into staging

Xen 2018/05/22

# gpg: Signature made Tue 22 May 2018 19:44:06 BST
# gpg:                using RSA key 894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg:                 aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini-http/tags/xen-20180522-tag:
  xen_disk: be consistent with use of xendev and blkdev->xendev
  xen_disk: use a single entry iovec
  xen_backend: make the xen_feature_grant_copy flag private
  xen_disk: remove use of grant map/unmap
  xen_backend: add an emulation of grant copy
  xen: remove other open-coded use of libxengnttab
  xen_disk: remove open-coded use of libxengnttab
  xen_backend: add grant table helpers
  xen: add a meaningful declaration of grant_copy_segment into xen_common.h
  checkpatch: generalize xen handle matching in the list of types
  xen-hvm: create separate function for ioreq server initialization
  xen_pt: Present the size of 64 bit BARs correctly
  configure: Add explanation for --enable-xen-pci-passthrough
  xen/pt: use address_space_memory object for memory region hooks
  xen-pvdevice: Introduce a simplistic xen-pvdevice save state

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-05-24 11:30:59 +01:00
parent 9cac60db45 443c3c9cf1
commit 5ff2a4b97f
14 changed files with 426 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1588,7 +1588,7 @@ disabled with --disable-FEATURE, default is enabled if available:
virtfs VirtFS virtfs VirtFS
mpath Multipath persistent reservation passthrough mpath Multipath persistent reservation passthrough
xen xen backend driver support xen xen backend driver support
xen-pci-passthrough xen-pci-passthrough PCI passthrough support for Xen
brlapi BrlAPI (Braile) brlapi BrlAPI (Braile)
curl curl connectivity curl curl connectivity
membarrier membarrier system call (for Linux 4.14+ or Windows) membarrier membarrier system call (for Linux 4.14+ or Windows)

32
hw/9pfs/xen-9p-backend.c
View File

@ -331,14 +331,14 @@ static int xen_9pfs_free(struct XenDevice *xendev)
for (i = 0; i < xen_9pdev->num_rings; i++) { for (i = 0; i < xen_9pdev->num_rings; i++) {
if (xen_9pdev->rings[i].data != NULL) { if (xen_9pdev->rings[i].data != NULL) {
xengnttab_unmap(xen_9pdev->xendev.gnttabdev, xen_be_unmap_grant_refs(&xen_9pdev->xendev,
xen_9pdev->rings[i].data, xen_9pdev->rings[i].data,
(1 << xen_9pdev->rings[i].ring_order)); (1 << xen_9pdev->rings[i].ring_order));
} }
if (xen_9pdev->rings[i].intf != NULL) { if (xen_9pdev->rings[i].intf != NULL) {
xengnttab_unmap(xen_9pdev->xendev.gnttabdev, xen_be_unmap_grant_refs(&xen_9pdev->xendev,
xen_9pdev->rings[i].intf, xen_9pdev->rings[i].intf,
1); 1);
} }
if (xen_9pdev->rings[i].bh != NULL) { if (xen_9pdev->rings[i].bh != NULL) {
qemu_bh_delete(xen_9pdev->rings[i].bh); qemu_bh_delete(xen_9pdev->rings[i].bh);
@ -390,11 +390,10 @@ static int xen_9pfs_connect(struct XenDevice *xendev)
} }
g_free(str); g_free(str);
xen_9pdev->rings[i].intf = xengnttab_map_grant_ref( xen_9pdev->rings[i].intf =
xen_9pdev->xendev.gnttabdev, xen_be_map_grant_ref(&xen_9pdev->xendev,
xen_9pdev->xendev.dom, xen_9pdev->rings[i].ref,
xen_9pdev->rings[i].ref, PROT_READ | PROT_WRITE);
PROT_READ | PROT_WRITE);
if (!xen_9pdev->rings[i].intf) { if (!xen_9pdev->rings[i].intf) {
goto out; goto out;
} }
@ -403,12 +402,11 @@ static int xen_9pfs_connect(struct XenDevice *xendev)
goto out; goto out;
} }
xen_9pdev->rings[i].ring_order = ring_order; xen_9pdev->rings[i].ring_order = ring_order;
xen_9pdev->rings[i].data = xengnttab_map_domain_grant_refs( xen_9pdev->rings[i].data =
xen_9pdev->xendev.gnttabdev, xen_be_map_grant_refs(&xen_9pdev->xendev,
(1 << ring_order), xen_9pdev->rings[i].intf->ref,
xen_9pdev->xendev.dom, (1 << ring_order),
xen_9pdev->rings[i].intf->ref, PROT_READ | PROT_WRITE);
PROT_READ | PROT_WRITE);
if (!xen_9pdev->rings[i].data) { if (!xen_9pdev->rings[i].data) {
goto out; goto out;
} }

614
hw/block/xen_disk.c
View File

@ -36,27 +36,9 @@
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
static int batch_maps = 0;
/* ------------------------------------------------------------- */
#define BLOCK_SIZE 512 #define BLOCK_SIZE 512
#define IOCB_COUNT (BLKIF_MAX_SEGMENTS_PER_REQUEST + 2) #define IOCB_COUNT (BLKIF_MAX_SEGMENTS_PER_REQUEST + 2)
struct PersistentGrant {
void *page;
struct XenBlkDev *blkdev;
};
typedef struct PersistentGrant PersistentGrant;
struct PersistentRegion {
void *addr;
int num;
};
typedef struct PersistentRegion PersistentRegion;
struct ioreq { struct ioreq {
blkif_request_t req; blkif_request_t req;
int16_t status; int16_t status;
@ -64,16 +46,9 @@ struct ioreq {
/* parsed request */ /* parsed request */
off_t start; off_t start;
QEMUIOVector v; QEMUIOVector v;
void *buf;
size_t size;
int presync; int presync;
uint8_t mapped;
/* grant mapping */
uint32_t domids[BLKIF_MAX_SEGMENTS_PER_REQUEST];
uint32_t refs[BLKIF_MAX_SEGMENTS_PER_REQUEST];
int prot;
void *page[BLKIF_MAX_SEGMENTS_PER_REQUEST];
void *pages;
int num_unmap;
/* aio status */ /* aio status */
int aio_inflight; int aio_inflight;
@ -104,7 +79,6 @@ struct XenBlkDev {
int protocol; int protocol;
blkif_back_rings_t rings; blkif_back_rings_t rings;
int more_work; int more_work;
int cnt_map;
/* request lists */ /* request lists */
QLIST_HEAD(inflight_head, ioreq) inflight; QLIST_HEAD(inflight_head, ioreq) inflight;
@ -115,13 +89,7 @@ struct XenBlkDev {
int requests_finished; int requests_finished;
unsigned int max_requests; unsigned int max_requests;
/* Persistent grants extension */
gboolean feature_discard; gboolean feature_discard;
gboolean feature_persistent;
GTree *persistent_gnts;
GSList *persistent_regions;
unsigned int persistent_gnt_count;
unsigned int max_grants;
/* qemu block driver */ /* qemu block driver */
DriveInfo *dinfo; DriveInfo *dinfo;
@ -139,14 +107,9 @@ static void ioreq_reset(struct ioreq *ioreq)
memset(&ioreq->req, 0, sizeof(ioreq->req)); memset(&ioreq->req, 0, sizeof(ioreq->req));
ioreq->status = 0; ioreq->status = 0;
ioreq->start = 0; ioreq->start = 0;
ioreq->buf = NULL;
ioreq->size = 0;
ioreq->presync = 0; ioreq->presync = 0;
ioreq->mapped = 0;
memset(ioreq->domids, 0, sizeof(ioreq->domids));
memset(ioreq->refs, 0, sizeof(ioreq->refs));
ioreq->prot = 0;
memset(ioreq->page, 0, sizeof(ioreq->page));
ioreq->pages = NULL;
ioreq->aio_inflight = 0; ioreq->aio_inflight = 0;
ioreq->aio_errors = 0; ioreq->aio_errors = 0;
@ -158,46 +121,6 @@ static void ioreq_reset(struct ioreq *ioreq)
qemu_iovec_reset(&ioreq->v); qemu_iovec_reset(&ioreq->v);
} }
static gint int_cmp(gconstpointer a, gconstpointer b, gpointer user_data)
{
uint ua = GPOINTER_TO_UINT(a);
uint ub = GPOINTER_TO_UINT(b);
return (ua > ub) - (ua < ub);
}
static void destroy_grant(gpointer pgnt)
{
PersistentGrant *grant = pgnt;
xengnttab_handle *gnt = grant->blkdev->xendev.gnttabdev;
if (xengnttab_unmap(gnt, grant->page, 1) != 0) {
xen_pv_printf(&grant->blkdev->xendev, 0,
"xengnttab_unmap failed: %s\n",
strerror(errno));
}
grant->blkdev->persistent_gnt_count--;
xen_pv_printf(&grant->blkdev->xendev, 3,
"unmapped grant %p\n", grant->page);
g_free(grant);
}
static void remove_persistent_region(gpointer data, gpointer dev)
{
PersistentRegion *region = data;
struct XenBlkDev *blkdev = dev;
xengnttab_handle *gnt = blkdev->xendev.gnttabdev;
if (xengnttab_unmap(gnt, region->addr, region->num) != 0) {
xen_pv_printf(&blkdev->xendev, 0,
"xengnttab_unmap region %p failed: %s\n",
region->addr, strerror(errno));
}
xen_pv_printf(&blkdev->xendev, 3,
"unmapped grant region %p with %d pages\n",
region->addr, region->num);
g_free(region);
}
static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
{ {
struct ioreq *ioreq = NULL; struct ioreq *ioreq = NULL;
@ -210,7 +133,7 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
ioreq = g_malloc0(sizeof(*ioreq)); ioreq = g_malloc0(sizeof(*ioreq));
ioreq->blkdev = blkdev; ioreq->blkdev = blkdev;
blkdev->requests_total++; blkdev->requests_total++;
qemu_iovec_init(&ioreq->v, BLKIF_MAX_SEGMENTS_PER_REQUEST); qemu_iovec_init(&ioreq->v, 1);
} else { } else {
/* get one from freelist */ /* get one from freelist */
ioreq = QLIST_FIRST(&blkdev->freelist); ioreq = QLIST_FIRST(&blkdev->freelist);
@ -255,17 +178,16 @@ static void ioreq_release(struct ioreq *ioreq, bool finish)
static int ioreq_parse(struct ioreq *ioreq) static int ioreq_parse(struct ioreq *ioreq)
{ {
struct XenBlkDev *blkdev = ioreq->blkdev; struct XenBlkDev *blkdev = ioreq->blkdev;
uintptr_t mem; struct XenDevice *xendev = &blkdev->xendev;
size_t len; size_t len;
int i; int i;
xen_pv_printf(&blkdev->xendev, 3, xen_pv_printf(xendev, 3,
"op %d, nr %d, handle %d, id %" PRId64 ", sector %" PRId64 "\n", "op %d, nr %d, handle %d, id %" PRId64 ", sector %" PRId64 "\n",
ioreq->req.operation, ioreq->req.nr_segments, ioreq->req.operation, ioreq->req.nr_segments,
ioreq->req.handle, ioreq->req.id, ioreq->req.sector_number); ioreq->req.handle, ioreq->req.id, ioreq->req.sector_number);
switch (ioreq->req.operation) { switch (ioreq->req.operation) {
case BLKIF_OP_READ: case BLKIF_OP_READ:
ioreq->prot = PROT_WRITE; /* to memory */
break; break;
case BLKIF_OP_FLUSH_DISKCACHE: case BLKIF_OP_FLUSH_DISKCACHE:
ioreq->presync = 1; ioreq->presync = 1;
@ -274,45 +196,40 @@ static int ioreq_parse(struct ioreq *ioreq)
} }
/* fall through */ /* fall through */
case BLKIF_OP_WRITE: case BLKIF_OP_WRITE:
ioreq->prot = PROT_READ; /* from memory */
break; break;
case BLKIF_OP_DISCARD: case BLKIF_OP_DISCARD:
return 0; return 0;
default: default:
xen_pv_printf(&blkdev->xendev, 0, "error: unknown operation (%d)\n", xen_pv_printf(xendev, 0, "error: unknown operation (%d)\n",
ioreq->req.operation); ioreq->req.operation);
goto err; goto err;
}; };
if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') { if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') {
xen_pv_printf(&blkdev->xendev, 0, "error: write req for ro device\n"); xen_pv_printf(xendev, 0, "error: write req for ro device\n");
goto err; goto err;
} }
ioreq->start = ioreq->req.sector_number * blkdev->file_blk; ioreq->start = ioreq->req.sector_number * blkdev->file_blk;
for (i = 0; i < ioreq->req.nr_segments; i++) { for (i = 0; i < ioreq->req.nr_segments; i++) {
if (i == BLKIF_MAX_SEGMENTS_PER_REQUEST) { if (i == BLKIF_MAX_SEGMENTS_PER_REQUEST) {
xen_pv_printf(&blkdev->xendev, 0, "error: nr_segments too big\n"); xen_pv_printf(xendev, 0, "error: nr_segments too big\n");
goto err; goto err;
} }
if (ioreq->req.seg[i].first_sect > ioreq->req.seg[i].last_sect) { if (ioreq->req.seg[i].first_sect > ioreq->req.seg[i].last_sect) {
xen_pv_printf(&blkdev->xendev, 0, "error: first > last sector\n"); xen_pv_printf(xendev, 0, "error: first > last sector\n");
goto err; goto err;
} }
if (ioreq->req.seg[i].last_sect * BLOCK_SIZE >= XC_PAGE_SIZE) { if (ioreq->req.seg[i].last_sect * BLOCK_SIZE >= XC_PAGE_SIZE) {
xen_pv_printf(&blkdev->xendev, 0, "error: page crossing\n"); xen_pv_printf(xendev, 0, "error: page crossing\n");
goto err; goto err;
} }
ioreq->domids[i] = blkdev->xendev.dom;
ioreq->refs[i] = ioreq->req.seg[i].gref;
mem = ioreq->req.seg[i].first_sect * blkdev->file_blk;
len = (ioreq->req.seg[i].last_sect - ioreq->req.seg[i].first_sect + 1) * blkdev->file_blk; len = (ioreq->req.seg[i].last_sect - ioreq->req.seg[i].first_sect + 1) * blkdev->file_blk;
qemu_iovec_add(&ioreq->v, (void*)mem, len); ioreq->size += len;
} }
if (ioreq->start + ioreq->v.size > blkdev->file_size) { if (ioreq->start + ioreq->size > blkdev->file_size) {
xen_pv_printf(&blkdev->xendev, 0, "error: access beyond end of file\n"); xen_pv_printf(xendev, 0, "error: access beyond end of file\n");
goto err; goto err;
} }
return 0; return 0;
@ -322,279 +239,48 @@ err:
return -1; return -1;
} }
static void ioreq_unmap(struct ioreq *ioreq)
{
xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev;
int i;
if (ioreq->num_unmap == 0 || ioreq->mapped == 0) {
return;
}
if (batch_maps) {
if (!ioreq->pages) {
return;
}
if (xengnttab_unmap(gnt, ioreq->pages, ioreq->num_unmap) != 0) {
xen_pv_printf(&ioreq->blkdev->xendev, 0,
"xengnttab_unmap failed: %s\n",
strerror(errno));
}
ioreq->blkdev->cnt_map -= ioreq->num_unmap;
ioreq->pages = NULL;
} else {
for (i = 0; i < ioreq->num_unmap; i++) {
if (!ioreq->page[i]) {
continue;
}
if (xengnttab_unmap(gnt, ioreq->page[i], 1) != 0) {
xen_pv_printf(&ioreq->blkdev->xendev, 0,
"xengnttab_unmap failed: %s\n",
strerror(errno));
}
ioreq->blkdev->cnt_map--;
ioreq->page[i] = NULL;
}
}
ioreq->mapped = 0;
}
static int ioreq_map(struct ioreq *ioreq)
{
xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev;
uint32_t domids[BLKIF_MAX_SEGMENTS_PER_REQUEST];
uint32_t refs[BLKIF_MAX_SEGMENTS_PER_REQUEST];
void *page[BLKIF_MAX_SEGMENTS_PER_REQUEST];
int i, j, new_maps = 0;
PersistentGrant *grant;
PersistentRegion *region;
/* domids and refs variables will contain the information necessary
* to map the grants that are needed to fulfill this request.
*
* After mapping the needed grants, the page array will contain the
* memory address of each granted page in the order specified in ioreq
* (disregarding if it's a persistent grant or not).
*/
if (ioreq->v.niov == 0 || ioreq->mapped == 1) {
return 0;
}
if (ioreq->blkdev->feature_persistent) {
for (i = 0; i < ioreq->v.niov; i++) {
grant = g_tree_lookup(ioreq->blkdev->persistent_gnts,
GUINT_TO_POINTER(ioreq->refs[i]));
if (grant != NULL) {
page[i] = grant->page;
xen_pv_printf(&ioreq->blkdev->xendev, 3,
"using persistent-grant %" PRIu32 "\n",
ioreq->refs[i]);
} else {
/* Add the grant to the list of grants that
* should be mapped
*/
domids[new_maps] = ioreq->domids[i];
refs[new_maps] = ioreq->refs[i];
page[i] = NULL;
new_maps++;
}
}
/* Set the protection to RW, since grants may be reused later
* with a different protection than the one needed for this request
*/
ioreq->prot = PROT_WRITE | PROT_READ;
} else {
/* All grants in the request should be mapped */
memcpy(refs, ioreq->refs, sizeof(refs));
memcpy(domids, ioreq->domids, sizeof(domids));
memset(page, 0, sizeof(page));
new_maps = ioreq->v.niov;
}
if (batch_maps && new_maps) {
ioreq->pages = xengnttab_map_grant_refs
(gnt, new_maps, domids, refs, ioreq->prot);
if (ioreq->pages == NULL) {
xen_pv_printf(&ioreq->blkdev->xendev, 0,
"can't map %d grant refs (%s, %d maps)\n",
new_maps, strerror(errno), ioreq->blkdev->cnt_map);
return -1;
}
for (i = 0, j = 0; i < ioreq->v.niov; i++) {
if (page[i] == NULL) {
page[i] = ioreq->pages + (j++) * XC_PAGE_SIZE;
}
}
ioreq->blkdev->cnt_map += new_maps;
} else if (new_maps) {
for (i = 0; i < new_maps; i++) {
ioreq->page[i] = xengnttab_map_grant_ref
(gnt, domids[i], refs[i], ioreq->prot);
if (ioreq->page[i] == NULL) {
xen_pv_printf(&ioreq->blkdev->xendev, 0,
"can't map grant ref %d (%s, %d maps)\n",
refs[i], strerror(errno), ioreq->blkdev->cnt_map);
ioreq->mapped = 1;
ioreq_unmap(ioreq);
return -1;
}
ioreq->blkdev->cnt_map++;
}
for (i = 0, j = 0; i < ioreq->v.niov; i++) {
if (page[i] == NULL) {
page[i] = ioreq->page[j++];
}
}
}
if (ioreq->blkdev->feature_persistent && new_maps != 0 &&
(!batch_maps || (ioreq->blkdev->persistent_gnt_count + new_maps <=
ioreq->blkdev->max_grants))) {
/*
* If we are using persistent grants and batch mappings only
* add the new maps to the list of persistent grants if the whole
* area can be persistently mapped.
*/
if (batch_maps) {
region = g_malloc0(sizeof(*region));
region->addr = ioreq->pages;
region->num = new_maps;
ioreq->blkdev->persistent_regions = g_slist_append(
ioreq->blkdev->persistent_regions,
region);
}
while ((ioreq->blkdev->persistent_gnt_count < ioreq->blkdev->max_grants)
&& new_maps) {
/* Go through the list of newly mapped grants and add as many
* as possible to the list of persistently mapped grants.
*
* Since we start at the end of ioreq->page(s), we only need
* to decrease new_maps to prevent this granted pages from
* being unmapped in ioreq_unmap.
*/
grant = g_malloc0(sizeof(*grant));
new_maps--;
if (batch_maps) {
grant->page = ioreq->pages + (new_maps) * XC_PAGE_SIZE;
} else {
grant->page = ioreq->page[new_maps];
}
grant->blkdev = ioreq->blkdev;
xen_pv_printf(&ioreq->blkdev->xendev, 3,
"adding grant %" PRIu32 " page: %p\n",
refs[new_maps], grant->page);
g_tree_insert(ioreq->blkdev->persistent_gnts,
GUINT_TO_POINTER(refs[new_maps]),
grant);
ioreq->blkdev->persistent_gnt_count++;
}
assert(!batch_maps || new_maps == 0);
}
for (i = 0; i < ioreq->v.niov; i++) {
ioreq->v.iov[i].iov_base += (uintptr_t)page[i];
}
ioreq->mapped = 1;
ioreq->num_unmap = new_maps;
return 0;
}
#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40800
static void ioreq_free_copy_buffers(struct ioreq *ioreq)
{
int i;
for (i = 0; i < ioreq->v.niov; i++) {
ioreq->page[i] = NULL;
}
qemu_vfree(ioreq->pages);
}
static int ioreq_init_copy_buffers(struct ioreq *ioreq)
{
int i;
if (ioreq->v.niov == 0) {
return 0;
}
ioreq->pages = qemu_memalign(XC_PAGE_SIZE, ioreq->v.niov * XC_PAGE_SIZE);
for (i = 0; i < ioreq->v.niov; i++) {
ioreq->page[i] = ioreq->pages + i * XC_PAGE_SIZE;
ioreq->v.iov[i].iov_base = ioreq->page[i];
}
return 0;
}
static int ioreq_grant_copy(struct ioreq *ioreq) static int ioreq_grant_copy(struct ioreq *ioreq)
{ {
xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev; struct XenBlkDev *blkdev = ioreq->blkdev;
xengnttab_grant_copy_segment_t segs[BLKIF_MAX_SEGMENTS_PER_REQUEST]; struct XenDevice *xendev = &blkdev->xendev;
XenGrantCopySegment segs[BLKIF_MAX_SEGMENTS_PER_REQUEST];
int i, count, rc; int i, count, rc;
int64_t file_blk = ioreq->blkdev->file_blk; int64_t file_blk = blkdev->file_blk;
bool to_domain = (ioreq->req.operation == BLKIF_OP_READ);
void *virt = ioreq->buf;
if (ioreq->v.niov == 0) { if (ioreq->req.nr_segments == 0) {
return 0; return 0;
} }
count = ioreq->v.niov; count = ioreq->req.nr_segments;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (ioreq->req.operation == BLKIF_OP_READ) { if (to_domain) {
segs[i].flags = GNTCOPY_dest_gref; segs[i].dest.foreign.ref = ioreq->req.seg[i].gref;
segs[i].dest.foreign.ref = ioreq->refs[i];
segs[i].dest.foreign.domid = ioreq->domids[i];
segs[i].dest.foreign.offset = ioreq->req.seg[i].first_sect * file_blk; segs[i].dest.foreign.offset = ioreq->req.seg[i].first_sect * file_blk;
segs[i].source.virt = ioreq->v.iov[i].iov_base; segs[i].source.virt = virt;
} else { } else {
segs[i].flags = GNTCOPY_source_gref; segs[i].source.foreign.ref = ioreq->req.seg[i].gref;
segs[i].source.foreign.ref = ioreq->refs[i];
segs[i].source.foreign.domid = ioreq->domids[i];
segs[i].source.foreign.offset = ioreq->req.seg[i].first_sect * file_blk; segs[i].source.foreign.offset = ioreq->req.seg[i].first_sect * file_blk;
segs[i].dest.virt = ioreq->v.iov[i].iov_base; segs[i].dest.virt = virt;
} }
segs[i].len = (ioreq->req.seg[i].last_sect segs[i].len = (ioreq->req.seg[i].last_sect
- ioreq->req.seg[i].first_sect + 1) * file_blk; - ioreq->req.seg[i].first_sect + 1) * file_blk;
virt += segs[i].len;
} }
rc = xengnttab_grant_copy(gnt, count, segs); rc = xen_be_copy_grant_refs(xendev, to_domain, segs, count);
if (rc) { if (rc) {
xen_pv_printf(&ioreq->blkdev->xendev, 0, xen_pv_printf(xendev, 0,
"failed to copy data %d\n", rc); "failed to copy data %d\n", rc);
ioreq->aio_errors++; ioreq->aio_errors++;
return -1; return -1;
} }
for (i = 0; i < count; i++) {
if (segs[i].status != GNTST_okay) {
xen_pv_printf(&ioreq->blkdev->xendev, 3,
"failed to copy data %d for gref %d, domid %d\n",
segs[i].status, ioreq->refs[i], ioreq->domids[i]);
ioreq->aio_errors++;
rc = -1;
}
}
return rc; return rc;
} }
#else
static void ioreq_free_copy_buffers(struct ioreq *ioreq)
{
abort();
}
static int ioreq_init_copy_buffers(struct ioreq *ioreq)
{
abort();
}
static int ioreq_grant_copy(struct ioreq *ioreq)
{
abort();
}
#endif
static int ioreq_runio_qemu_aio(struct ioreq *ioreq); static int ioreq_runio_qemu_aio(struct ioreq *ioreq);
@ -602,11 +288,12 @@ static void qemu_aio_complete(void *opaque, int ret)
{ {
struct ioreq *ioreq = opaque; struct ioreq *ioreq = opaque;
struct XenBlkDev *blkdev = ioreq->blkdev; struct XenBlkDev *blkdev = ioreq->blkdev;
struct XenDevice *xendev = &blkdev->xendev;
aio_context_acquire(blkdev->ctx); aio_context_acquire(blkdev->ctx);
if (ret != 0) { if (ret != 0) {
xen_pv_printf(&blkdev->xendev, 0, "%s I/O error\n", xen_pv_printf(xendev, 0, "%s I/O error\n",
ioreq->req.operation == BLKIF_OP_READ ? "read" : "write"); ioreq->req.operation == BLKIF_OP_READ ? "read" : "write");
ioreq->aio_errors++; ioreq->aio_errors++;
} }
@ -621,32 +308,28 @@ static void qemu_aio_complete(void *opaque, int ret)
goto done; goto done;
} }
if (xen_feature_grant_copy) { switch (ioreq->req.operation) {
switch (ioreq->req.operation) { case BLKIF_OP_READ:
case BLKIF_OP_READ: /* in case of failure ioreq->aio_errors is increased */
/* in case of failure ioreq->aio_errors is increased */ if (ret == 0) {
if (ret == 0) { ioreq_grant_copy(ioreq);
ioreq_grant_copy(ioreq); }
} qemu_vfree(ioreq->buf);
ioreq_free_copy_buffers(ioreq); break;
break; case BLKIF_OP_WRITE:
case BLKIF_OP_WRITE: case BLKIF_OP_FLUSH_DISKCACHE:
case BLKIF_OP_FLUSH_DISKCACHE: if (!ioreq->req.nr_segments) {
if (!ioreq->req.nr_segments) {
break;
}
ioreq_free_copy_buffers(ioreq);
break;
default:
break; break;
} }
qemu_vfree(ioreq->buf);
break;
default:
break;
} }
ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY; ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;
if (!xen_feature_grant_copy) {
ioreq_unmap(ioreq);
}
ioreq_finish(ioreq); ioreq_finish(ioreq);
switch (ioreq->req.operation) { switch (ioreq->req.operation) {
case BLKIF_OP_WRITE: case BLKIF_OP_WRITE:
case BLKIF_OP_FLUSH_DISKCACHE: case BLKIF_OP_FLUSH_DISKCACHE:
@ -706,18 +389,13 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
{ {
struct XenBlkDev *blkdev = ioreq->blkdev; struct XenBlkDev *blkdev = ioreq->blkdev;
if (xen_feature_grant_copy) { ioreq->buf = qemu_memalign(XC_PAGE_SIZE, ioreq->size);
ioreq_init_copy_buffers(ioreq); if (ioreq->req.nr_segments &&
if (ioreq->req.nr_segments && (ioreq->req.operation == BLKIF_OP_WRITE || (ioreq->req.operation == BLKIF_OP_WRITE ||
ioreq->req.operation == BLKIF_OP_FLUSH_DISKCACHE) && ioreq->req.operation == BLKIF_OP_FLUSH_DISKCACHE) &&
ioreq_grant_copy(ioreq)) { ioreq_grant_copy(ioreq)) {
ioreq_free_copy_buffers(ioreq); qemu_vfree(ioreq->buf);
goto err; goto err;
}
} else {
if (ioreq->req.nr_segments && ioreq_map(ioreq)) {
goto err;
}
} }
ioreq->aio_inflight++; ioreq->aio_inflight++;
@ -728,6 +406,7 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
switch (ioreq->req.operation) { switch (ioreq->req.operation) {
case BLKIF_OP_READ: case BLKIF_OP_READ:
qemu_iovec_add(&ioreq->v, ioreq->buf, ioreq->size);
block_acct_start(blk_get_stats(blkdev->blk), &ioreq->acct, block_acct_start(blk_get_stats(blkdev->blk), &ioreq->acct,
ioreq->v.size, BLOCK_ACCT_READ); ioreq->v.size, BLOCK_ACCT_READ);
ioreq->aio_inflight++; ioreq->aio_inflight++;
@ -740,6 +419,7 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
break; break;
} }
qemu_iovec_add(&ioreq->v, ioreq->buf, ioreq->size);
block_acct_start(blk_get_stats(blkdev->blk), &ioreq->acct, block_acct_start(blk_get_stats(blkdev->blk), &ioreq->acct,
ioreq->v.size, ioreq->v.size,
ioreq->req.operation == BLKIF_OP_WRITE ? ioreq->req.operation == BLKIF_OP_WRITE ?
@ -758,9 +438,6 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
} }
default: default:
/* unknown operation (shouldn't happen -- parse catches this) */ /* unknown operation (shouldn't happen -- parse catches this) */
if (!xen_feature_grant_copy) {
ioreq_unmap(ioreq);
}
goto err; goto err;
} }
@ -946,24 +623,21 @@ static void blk_alloc(struct XenDevice *xendev)
blkdev->ctx = iothread_get_aio_context(blkdev->iothread); blkdev->ctx = iothread_get_aio_context(blkdev->iothread);
blkdev->bh = aio_bh_new(blkdev->ctx, blk_bh, blkdev); blkdev->bh = aio_bh_new(blkdev->ctx, blk_bh, blkdev);
if (xen_mode != XEN_EMULATE) {
batch_maps = 1;
}
} }
static void blk_parse_discard(struct XenBlkDev *blkdev) static void blk_parse_discard(struct XenBlkDev *blkdev)
{ {
struct XenDevice *xendev = &blkdev->xendev;
int enable; int enable;
blkdev->feature_discard = true; blkdev->feature_discard = true;
if (xenstore_read_be_int(&blkdev->xendev, "discard-enable", &enable) == 0) { if (xenstore_read_be_int(xendev, "discard-enable", &enable) == 0) {
blkdev->feature_discard = !!enable; blkdev->feature_discard = !!enable;
} }
if (blkdev->feature_discard) { if (blkdev->feature_discard) {
xenstore_write_be_int(&blkdev->xendev, "feature-discard", 1); xenstore_write_be_int(xendev, "feature-discard", 1);
} }
} }
@ -978,7 +652,7 @@ static int blk_init(struct XenDevice *xendev)
/* read xenstore entries */ /* read xenstore entries */
if (blkdev->params == NULL) { if (blkdev->params == NULL) {
char *h = NULL; char *h = NULL;
blkdev->params = xenstore_read_be_str(&blkdev->xendev, "params"); blkdev->params = xenstore_read_be_str(xendev, "params");
if (blkdev->params != NULL) { if (blkdev->params != NULL) {
h = strchr(blkdev->params, ':'); h = strchr(blkdev->params, ':');
} }
@ -998,18 +672,18 @@ static int blk_init(struct XenDevice *xendev)
blkdev->fileproto = "vpc"; blkdev->fileproto = "vpc";
} }
if (blkdev->mode == NULL) { if (blkdev->mode == NULL) {
blkdev->mode = xenstore_read_be_str(&blkdev->xendev, "mode"); blkdev->mode = xenstore_read_be_str(xendev, "mode");
} }
if (blkdev->type == NULL) { if (blkdev->type == NULL) {
blkdev->type = xenstore_read_be_str(&blkdev->xendev, "type"); blkdev->type = xenstore_read_be_str(xendev, "type");
} }
if (blkdev->dev == NULL) { if (blkdev->dev == NULL) {
blkdev->dev = xenstore_read_be_str(&blkdev->xendev, "dev"); blkdev->dev = xenstore_read_be_str(xendev, "dev");
} }
if (blkdev->devtype == NULL) { if (blkdev->devtype == NULL) {
blkdev->devtype = xenstore_read_be_str(&blkdev->xendev, "device-type"); blkdev->devtype = xenstore_read_be_str(xendev, "device-type");
} }
directiosafe = xenstore_read_be_str(&blkdev->xendev, "direct-io-safe"); directiosafe = xenstore_read_be_str(xendev, "direct-io-safe");
blkdev->directiosafe = (directiosafe && atoi(directiosafe)); blkdev->directiosafe = (directiosafe && atoi(directiosafe));
/* do we have all we need? */ /* do we have all we need? */
@ -1032,18 +706,13 @@ static int blk_init(struct XenDevice *xendev)
blkdev->file_blk = BLOCK_SIZE; blkdev->file_blk = BLOCK_SIZE;
xen_pv_printf(&blkdev->xendev, 3, "grant copy operation %s\n",
xen_feature_grant_copy ? "enabled" : "disabled");
/* fill info /* fill info
* blk_connect supplies sector-size and sectors * blk_connect supplies sector-size and sectors
*/ */
xenstore_write_be_int(&blkdev->xendev, "feature-flush-cache", 1); xenstore_write_be_int(xendev, "feature-flush-cache", 1);
xenstore_write_be_int(&blkdev->xendev, "feature-persistent", xenstore_write_be_int(xendev, "info", info);
!xen_feature_grant_copy);
xenstore_write_be_int(&blkdev->xendev, "info", info);
xenstore_write_be_int(&blkdev->xendev, "max-ring-page-order", xenstore_write_be_int(xendev, "max-ring-page-order",
MAX_RING_PAGE_ORDER); MAX_RING_PAGE_ORDER);
blk_parse_discard(blkdev); blk_parse_discard(blkdev);
@ -1067,25 +736,15 @@ out_error:
return -1; return -1;
} }
/*
* We need to account for the grant allocations requiring contiguous
* chunks; the worst case number would be
* max_req * max_seg + (max_req - 1) * (max_seg - 1) + 1,
* but in order to keep things simple just use
* 2 * max_req * max_seg.
*/
#define MAX_GRANTS(max_req, max_seg) (2 * (max_req) * (max_seg))
static int blk_connect(struct XenDevice *xendev) static int blk_connect(struct XenDevice *xendev)
{ {
struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
int pers, index, qflags; int index, qflags;
bool readonly = true; bool readonly = true;
bool writethrough = true; bool writethrough = true;
int order, ring_ref; int order, ring_ref;
unsigned int ring_size, max_grants; unsigned int ring_size, max_grants;
unsigned int i; unsigned int i;
uint32_t *domids;
trace_xen_disk_connect(xendev->name); trace_xen_disk_connect(xendev->name);
@ -1105,7 +764,7 @@ static int blk_connect(struct XenDevice *xendev)
} }
/* init qemu block driver */ /* init qemu block driver */
index = (blkdev->xendev.dev - 202 * 256) / 16; index = (xendev->dev - 202 * 256) / 16;
blkdev->dinfo = drive_get(IF_XEN, 0, index); blkdev->dinfo = drive_get(IF_XEN, 0, index);
if (!blkdev->dinfo) { if (!blkdev->dinfo) {
Error *local_err = NULL; Error *local_err = NULL;
@ -1117,11 +776,11 @@ static int blk_connect(struct XenDevice *xendev)
} }
/* setup via xenbus -> create new block driver instance */ /* setup via xenbus -> create new block driver instance */
xen_pv_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); xen_pv_printf(xendev, 2, "create new bdrv (xenbus setup)\n");
blkdev->blk = blk_new_open(blkdev->filename, NULL, options, blkdev->blk = blk_new_open(blkdev->filename, NULL, options,
qflags, &local_err); qflags, &local_err);
if (!blkdev->blk) { if (!blkdev->blk) {
xen_pv_printf(&blkdev->xendev, 0, "error: %s\n", xen_pv_printf(xendev, 0, "error: %s\n",
error_get_pretty(local_err)); error_get_pretty(local_err));
error_free(local_err); error_free(local_err);
return -1; return -1;
@ -1129,11 +788,11 @@ static int blk_connect(struct XenDevice *xendev)
blk_set_enable_write_cache(blkdev->blk, !writethrough); blk_set_enable_write_cache(blkdev->blk, !writethrough);
} else { } else {
/* setup via qemu cmdline -> already setup for us */ /* setup via qemu cmdline -> already setup for us */
xen_pv_printf(&blkdev->xendev, 2, xen_pv_printf(xendev, 2,
"get configured bdrv (cmdline setup)\n"); "get configured bdrv (cmdline setup)\n");
blkdev->blk = blk_by_legacy_dinfo(blkdev->dinfo); blkdev->blk = blk_by_legacy_dinfo(blkdev->dinfo);
if (blk_is_read_only(blkdev->blk) && !readonly) { if (blk_is_read_only(blkdev->blk) && !readonly) {
xen_pv_printf(&blkdev->xendev, 0, "Unexpected read-only drive"); xen_pv_printf(xendev, 0, "Unexpected read-only drive");
blkdev->blk = NULL; blkdev->blk = NULL;
return -1; return -1;
} }
@ -1146,7 +805,7 @@ static int blk_connect(struct XenDevice *xendev)
if (blkdev->file_size < 0) { if (blkdev->file_size < 0) {
BlockDriverState *bs = blk_bs(blkdev->blk); BlockDriverState *bs = blk_bs(blkdev->blk);
const char *drv_name = bs ? bdrv_get_format_name(bs) : NULL; const char *drv_name = bs ? bdrv_get_format_name(bs) : NULL;
xen_pv_printf(&blkdev->xendev, 1, "blk_getlength: %d (%s) | drv %s\n", xen_pv_printf(xendev, 1, "blk_getlength: %d (%s) | drv %s\n",
(int)blkdev->file_size, strerror(-blkdev->file_size), (int)blkdev->file_size, strerror(-blkdev->file_size),
drv_name ?: "-"); drv_name ?: "-");
blkdev->file_size = 0; blkdev->file_size = 0;
@ -1158,15 +817,15 @@ static int blk_connect(struct XenDevice *xendev)
blkdev->file_size, blkdev->file_size >> 20); blkdev->file_size, blkdev->file_size >> 20);
/* Fill in number of sector size and number of sectors */ /* Fill in number of sector size and number of sectors */
xenstore_write_be_int(&blkdev->xendev, "sector-size", blkdev->file_blk); xenstore_write_be_int(xendev, "sector-size", blkdev->file_blk);
xenstore_write_be_int64(&blkdev->xendev, "sectors", xenstore_write_be_int64(xendev, "sectors",
blkdev->file_size / blkdev->file_blk); blkdev->file_size / blkdev->file_blk);
if (xenstore_read_fe_int(&blkdev->xendev, "ring-page-order", if (xenstore_read_fe_int(xendev, "ring-page-order",
&order) == -1) { &order) == -1) {
blkdev->nr_ring_ref = 1; blkdev->nr_ring_ref = 1;
if (xenstore_read_fe_int(&blkdev->xendev, "ring-ref", if (xenstore_read_fe_int(xendev, "ring-ref",
&ring_ref) == -1) { &ring_ref) == -1) {
return -1; return -1;
} }
@ -1183,7 +842,7 @@ static int blk_connect(struct XenDevice *xendev)
return -1; return -1;
} }
if (xenstore_read_fe_int(&blkdev->xendev, key, if (xenstore_read_fe_int(xendev, key,
&ring_ref) == -1) { &ring_ref) == -1) {
g_free(key); g_free(key);
return -1; return -1;
@ -1198,23 +857,18 @@ static int blk_connect(struct XenDevice *xendev)
return -1; return -1;
} }
if (xenstore_read_fe_int(&blkdev->xendev, "event-channel", if (xenstore_read_fe_int(xendev, "event-channel",
&blkdev->xendev.remote_port) == -1) { &xendev->remote_port) == -1) {
return -1; return -1;
} }
if (xenstore_read_fe_int(&blkdev->xendev, "feature-persistent", &pers)) {
blkdev->feature_persistent = FALSE;
} else {
blkdev->feature_persistent = !!pers;
}
if (!blkdev->xendev.protocol) { if (!xendev->protocol) {
blkdev->protocol = BLKIF_PROTOCOL_NATIVE; blkdev->protocol = BLKIF_PROTOCOL_NATIVE;
} else if (strcmp(blkdev->xendev.protocol, XEN_IO_PROTO_ABI_NATIVE) == 0) { } else if (strcmp(xendev->protocol, XEN_IO_PROTO_ABI_NATIVE) == 0) {
blkdev->protocol = BLKIF_PROTOCOL_NATIVE; blkdev->protocol = BLKIF_PROTOCOL_NATIVE;
} else if (strcmp(blkdev->xendev.protocol, XEN_IO_PROTO_ABI_X86_32) == 0) { } else if (strcmp(xendev->protocol, XEN_IO_PROTO_ABI_X86_32) == 0) {
blkdev->protocol = BLKIF_PROTOCOL_X86_32; blkdev->protocol = BLKIF_PROTOCOL_X86_32;
} else if (strcmp(blkdev->xendev.protocol, XEN_IO_PROTO_ABI_X86_64) == 0) { } else if (strcmp(xendev->protocol, XEN_IO_PROTO_ABI_X86_64) == 0) {
blkdev->protocol = BLKIF_PROTOCOL_X86_64; blkdev->protocol = BLKIF_PROTOCOL_X86_64;
} else { } else {
blkdev->protocol = BLKIF_PROTOCOL_NATIVE; blkdev->protocol = BLKIF_PROTOCOL_NATIVE;
@ -1241,43 +895,17 @@ static int blk_connect(struct XenDevice *xendev)
return -1; return -1;
} }
/* Calculate the maximum number of grants needed by ioreqs */
max_grants = MAX_GRANTS(blkdev->max_requests,
BLKIF_MAX_SEGMENTS_PER_REQUEST);
/* Add on the number needed for the ring pages */ /* Add on the number needed for the ring pages */
max_grants += blkdev->nr_ring_ref; max_grants = blkdev->nr_ring_ref;
blkdev->xendev.gnttabdev = xengnttab_open(NULL, 0);
if (blkdev->xendev.gnttabdev == NULL) {
xen_pv_printf(xendev, 0, "xengnttab_open failed: %s\n",
strerror(errno));
return -1;
}
if (xengnttab_set_max_grants(blkdev->xendev.gnttabdev, max_grants)) {
xen_pv_printf(xendev, 0, "xengnttab_set_max_grants failed: %s\n",
strerror(errno));
return -1;
}
domids = g_new0(uint32_t, blkdev->nr_ring_ref);
for (i = 0; i < blkdev->nr_ring_ref; i++) {
domids[i] = blkdev->xendev.dom;
}
blkdev->sring = xengnttab_map_grant_refs(blkdev->xendev.gnttabdev,
blkdev->nr_ring_ref,
domids,
blkdev->ring_ref,
PROT_READ | PROT_WRITE);
g_free(domids);
xen_be_set_max_grant_refs(xendev, max_grants);
blkdev->sring = xen_be_map_grant_refs(xendev, blkdev->ring_ref,
blkdev->nr_ring_ref,
PROT_READ | PROT_WRITE);
if (!blkdev->sring) { if (!blkdev->sring) {
return -1; return -1;
} }
blkdev->cnt_map++;
switch (blkdev->protocol) { switch (blkdev->protocol) {
case BLKIF_PROTOCOL_NATIVE: case BLKIF_PROTOCOL_NATIVE:
{ {
@ -1301,27 +929,14 @@ static int blk_connect(struct XenDevice *xendev)
} }
} }
if (blkdev->feature_persistent) {
/* Init persistent grants */
blkdev->max_grants = blkdev->max_requests *
BLKIF_MAX_SEGMENTS_PER_REQUEST;
blkdev->persistent_gnts = g_tree_new_full((GCompareDataFunc)int_cmp,
NULL, NULL,
batch_maps ?
(GDestroyNotify)g_free :
(GDestroyNotify)destroy_grant);
blkdev->persistent_regions = NULL;
blkdev->persistent_gnt_count = 0;
}
blk_set_aio_context(blkdev->blk, blkdev->ctx); blk_set_aio_context(blkdev->blk, blkdev->ctx);
xen_be_bind_evtchn(&blkdev->xendev); xen_be_bind_evtchn(xendev);
xen_pv_printf(&blkdev->xendev, 1, "ok: proto %s, nr-ring-ref %u, " xen_pv_printf(xendev, 1, "ok: proto %s, nr-ring-ref %u, "
"remote port %d, local port %d\n", "remote port %d, local port %d\n",
blkdev->xendev.protocol, blkdev->nr_ring_ref, xendev->protocol, blkdev->nr_ring_ref,
blkdev->xendev.remote_port, blkdev->xendev.local_port); xendev->remote_port, xendev->local_port);
return 0; return 0;
} }
@ -1339,41 +954,15 @@ static void blk_disconnect(struct XenDevice *xendev)
blk_unref(blkdev->blk); blk_unref(blkdev->blk);
blkdev->blk = NULL; blkdev->blk = NULL;
} }
xen_pv_unbind_evtchn(&blkdev->xendev); xen_pv_unbind_evtchn(xendev);
aio_context_release(blkdev->ctx); aio_context_release(blkdev->ctx);
if (blkdev->sring) { if (blkdev->sring) {
xengnttab_unmap(blkdev->xendev.gnttabdev, blkdev->sring, xen_be_unmap_grant_refs(xendev, blkdev->sring,
blkdev->nr_ring_ref); blkdev->nr_ring_ref);
blkdev->cnt_map--;
blkdev->sring = NULL; blkdev->sring = NULL;
} }
/*
* Unmap persistent grants before switching to the closed state
* so the frontend can free them.
*
* In the !batch_maps case g_tree_destroy will take care of unmapping
* the grant, but in the batch_maps case we need to iterate over every
* region in persistent_regions and unmap it.
*/
if (blkdev->feature_persistent) {
g_tree_destroy(blkdev->persistent_gnts);
assert(batch_maps || blkdev->persistent_gnt_count == 0);
if (batch_maps) {
blkdev->persistent_gnt_count = 0;
g_slist_foreach(blkdev->persistent_regions,
(GFunc)remove_persistent_region, blkdev);
g_slist_free(blkdev->persistent_regions);
}
blkdev->feature_persistent = false;
}
if (blkdev->xendev.gnttabdev) {
xengnttab_close(blkdev->xendev.gnttabdev);
blkdev->xendev.gnttabdev = NULL;
}
} }
static int blk_free(struct XenDevice *xendev) static int blk_free(struct XenDevice *xendev)
@ -1410,10 +999,11 @@ static void blk_event(struct XenDevice *xendev)
} }
struct XenDevOps xen_blkdev_ops = { struct XenDevOps xen_blkdev_ops = {
.flags = DEVOPS_FLAG_NEED_GNTDEV,
.size = sizeof(struct XenBlkDev), .size = sizeof(struct XenBlkDev),
.alloc = blk_alloc, .alloc = blk_alloc,
.init = blk_init, .init = blk_init,
.initialise = blk_connect, .initialise = blk_connect,
.disconnect = blk_disconnect, .disconnect = blk_disconnect,
.event = blk_event, .event = blk_event,
.free = blk_free, .free = blk_free,

9
hw/char/xen_console.c
View File

@ -233,12 +233,11 @@ static int con_initialise(struct XenDevice *xendev)
if (!xendev->dev) { if (!xendev->dev) {
xen_pfn_t mfn = con->ring_ref; xen_pfn_t mfn = con->ring_ref;
con->sring = xenforeignmemory_map(xen_fmem, con->xendev.dom, con->sring = xenforeignmemory_map(xen_fmem, con->xendev.dom,
PROT_READ|PROT_WRITE, PROT_READ | PROT_WRITE,
1, &mfn, NULL); 1, &mfn, NULL);
} else { } else {
con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom, con->sring = xen_be_map_grant_ref(xendev, con->ring_ref,
con->ring_ref, PROT_READ | PROT_WRITE);
PROT_READ|PROT_WRITE);
} }
if (!con->sring) if (!con->sring)
return -1; return -1;
@ -267,7 +266,7 @@ static void con_disconnect(struct XenDevice *xendev)
if (!xendev->dev) { if (!xendev->dev) {
xenforeignmemory_unmap(xen_fmem, con->sring, 1); xenforeignmemory_unmap(xen_fmem, con->sring, 1);
} else { } else {
xengnttab_unmap(xendev->gnttabdev, con->sring, 1); xen_be_unmap_grant_ref(xendev, con->sring);
} }
con->sring = NULL; con->sring = NULL;
} }

76
hw/i386/xen/xen-hvm.c
View File

@ -95,7 +95,8 @@ typedef struct XenIOState {
CPUState **cpu_by_vcpu_id; CPUState **cpu_by_vcpu_id;
/* the evtchn port for polling the notification, */ /* the evtchn port for polling the notification, */
evtchn_port_t *ioreq_local_port; evtchn_port_t *ioreq_local_port;
/* evtchn local port for buffered io */ /* evtchn remote and local ports for buffered io */
evtchn_port_t bufioreq_remote_port;
evtchn_port_t bufioreq_local_port; evtchn_port_t bufioreq_local_port;
/* the evtchn fd for polling */ /* the evtchn fd for polling */
xenevtchn_handle *xce_handle; xenevtchn_handle *xce_handle;
@ -1236,12 +1237,52 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
} }
static int xen_map_ioreq_server(XenIOState *state)
{
xen_pfn_t ioreq_pfn;
xen_pfn_t bufioreq_pfn;
evtchn_port_t bufioreq_evtchn;
int rc;
rc = xen_get_ioreq_server_info(xen_domid, state->ioservid,
&ioreq_pfn, &bufioreq_pfn,
&bufioreq_evtchn);
if (rc < 0) {
error_report("failed to get ioreq server info: error %d handle=%p",
errno, xen_xc);
return rc;
}
DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
PROT_READ | PROT_WRITE,
1, &ioreq_pfn, NULL);
if (state->shared_page == NULL) {
error_report("map shared IO page returned error %d handle=%p",
errno, xen_xc);
return -1;
}
state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
PROT_READ | PROT_WRITE,
1, &bufioreq_pfn, NULL);
if (state->buffered_io_page == NULL) {
error_report("map buffered IO page returned error %d", errno);
return -1;
}
state->bufioreq_remote_port = bufioreq_evtchn;
return 0;
}
void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
{ {
int i, rc; int i, rc;
xen_pfn_t ioreq_pfn; xen_pfn_t ioreq_pfn;
xen_pfn_t bufioreq_pfn;
evtchn_port_t bufioreq_evtchn;
XenIOState *state; XenIOState *state;
state = g_malloc0(sizeof (XenIOState)); state = g_malloc0(sizeof (XenIOState));
@ -1269,25 +1310,8 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
state->wakeup.notify = xen_wakeup_notifier; state->wakeup.notify = xen_wakeup_notifier;
qemu_register_wakeup_notifier(&state->wakeup); qemu_register_wakeup_notifier(&state->wakeup);
rc = xen_get_ioreq_server_info(xen_domid, state->ioservid, rc = xen_map_ioreq_server(state);
&ioreq_pfn, &bufioreq_pfn,
&bufioreq_evtchn);
if (rc < 0) { if (rc < 0) {
error_report("failed to get ioreq server info: error %d handle=%p",
errno, xen_xc);
goto err;
}
DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
PROT_READ|PROT_WRITE,
1, &ioreq_pfn, NULL);
if (state->shared_page == NULL) {
error_report("map shared IO page returned error %d handle=%p",
errno, xen_xc);
goto err; goto err;
} }
@ -1308,14 +1332,6 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
goto err; goto err;
} }
state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
PROT_READ|PROT_WRITE,
1, &bufioreq_pfn, NULL);
if (state->buffered_io_page == NULL) {
error_report("map buffered IO page returned error %d", errno);
goto err;
}
/* Note: cpus is empty at this point in init */ /* Note: cpus is empty at this point in init */
state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *)); state->cpu_by_vcpu_id = g_malloc0(max_cpus * sizeof(CPUState *));
@ -1340,7 +1356,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
} }
rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid, rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
bufioreq_evtchn); state->bufioreq_remote_port);
if (rc == -1) { if (rc == -1) {
error_report("buffered evtchn bind error %d", errno); error_report("buffered evtchn bind error %d", errno);
goto err; goto err;

11
hw/i386/xen/xen_pvdevice.c
View File

@ -71,6 +71,16 @@ static const MemoryRegionOps xen_pv_mmio_ops = {
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
}; };
static const VMStateDescription vmstate_xen_pvdevice = {
.name = "xen-pvdevice",
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, XenPVDevice),
VMSTATE_END_OF_LIST()
}
};
static void xen_pv_realize(PCIDevice *pci_dev, Error **errp) static void xen_pv_realize(PCIDevice *pci_dev, Error **errp)
{ {
XenPVDevice *d = XEN_PV_DEVICE(pci_dev); XenPVDevice *d = XEN_PV_DEVICE(pci_dev);
@ -120,6 +130,7 @@ static void xen_pv_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_SYSTEM_OTHER; k->class_id = PCI_CLASS_SYSTEM_OTHER;
dc->desc = "Xen PV Device"; dc->desc = "Xen PV Device";
dc->props = xen_pv_props; dc->props = xen_pv_props;
dc->vmsd = &vmstate_xen_pvdevice;
} }
static const TypeInfo xen_pv_type_info = { static const TypeInfo xen_pv_type_info = {

33
hw/net/xen_nic.c
View File

@ -160,9 +160,8 @@ static void net_tx_packets(struct XenNetDev *netdev)
(txreq.flags & NETTXF_more_data) ? " more_data" : "", (txreq.flags & NETTXF_more_data) ? " more_data" : "",
(txreq.flags & NETTXF_extra_info) ? " extra_info" : ""); (txreq.flags & NETTXF_extra_info) ? " extra_info" : "");
page = xengnttab_map_grant_ref(netdev->xendev.gnttabdev, page = xen_be_map_grant_ref(&netdev->xendev, txreq.gref,
netdev->xendev.dom, PROT_READ);
txreq.gref, PROT_READ);
if (page == NULL) { if (page == NULL) {
xen_pv_printf(&netdev->xendev, 0, xen_pv_printf(&netdev->xendev, 0,
"error: tx gref dereference failed (%d)\n", "error: tx gref dereference failed (%d)\n",
@ -183,7 +182,7 @@ static void net_tx_packets(struct XenNetDev *netdev)
qemu_send_packet(qemu_get_queue(netdev->nic), qemu_send_packet(qemu_get_queue(netdev->nic),
page + txreq.offset, txreq.size); page + txreq.offset, txreq.size);
} }
xengnttab_unmap(netdev->xendev.gnttabdev, page, 1); xen_be_unmap_grant_ref(&netdev->xendev, page);
net_tx_response(netdev, &txreq, NETIF_RSP_OKAY); net_tx_response(netdev, &txreq, NETIF_RSP_OKAY);
} }
if (!netdev->tx_work) { if (!netdev->tx_work) {
@ -254,9 +253,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
memcpy(&rxreq, RING_GET_REQUEST(&netdev->rx_ring, rc), sizeof(rxreq)); memcpy(&rxreq, RING_GET_REQUEST(&netdev->rx_ring, rc), sizeof(rxreq));
netdev->rx_ring.req_cons = ++rc; netdev->rx_ring.req_cons = ++rc;
page = xengnttab_map_grant_ref(netdev->xendev.gnttabdev, page = xen_be_map_grant_ref(&netdev->xendev, rxreq.gref, PROT_WRITE);
netdev->xendev.dom,
rxreq.gref, PROT_WRITE);
if (page == NULL) { if (page == NULL) {
xen_pv_printf(&netdev->xendev, 0, xen_pv_printf(&netdev->xendev, 0,
"error: rx gref dereference failed (%d)\n", "error: rx gref dereference failed (%d)\n",
@ -265,7 +262,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
return -1; return -1;
} }
memcpy(page + NET_IP_ALIGN, buf, size); memcpy(page + NET_IP_ALIGN, buf, size);
xengnttab_unmap(netdev->xendev.gnttabdev, page, 1); xen_be_unmap_grant_ref(&netdev->xendev, page);
net_rx_response(netdev, &rxreq, NETIF_RSP_OKAY, NET_IP_ALIGN, size, 0); net_rx_response(netdev, &rxreq, NETIF_RSP_OKAY, NET_IP_ALIGN, size, 0);
return size; return size;
@ -338,19 +335,17 @@ static int net_connect(struct XenDevice *xendev)
return -1; return -1;
} }
netdev->txs = xengnttab_map_grant_ref(netdev->xendev.gnttabdev, netdev->txs = xen_be_map_grant_ref(&netdev->xendev,
netdev->xendev.dom, netdev->tx_ring_ref,
netdev->tx_ring_ref, PROT_READ | PROT_WRITE);
PROT_READ | PROT_WRITE);
if (!netdev->txs) { if (!netdev->txs) {
return -1; return -1;
} }
netdev->rxs = xengnttab_map_grant_ref(netdev->xendev.gnttabdev, netdev->rxs = xen_be_map_grant_ref(&netdev->xendev,
netdev->xendev.dom, netdev->rx_ring_ref,
netdev->rx_ring_ref, PROT_READ | PROT_WRITE);
PROT_READ | PROT_WRITE);
if (!netdev->rxs) { if (!netdev->rxs) {
xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1); xen_be_unmap_grant_ref(&netdev->xendev, netdev->txs);
netdev->txs = NULL; netdev->txs = NULL;
return -1; return -1;
} }
@ -375,11 +370,11 @@ static void net_disconnect(struct XenDevice *xendev)
xen_pv_unbind_evtchn(&netdev->xendev); xen_pv_unbind_evtchn(&netdev->xendev);
if (netdev->txs) { if (netdev->txs) {
xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1); xen_be_unmap_grant_ref(&netdev->xendev, netdev->txs);
netdev->txs = NULL; netdev->txs = NULL;
} }
if (netdev->rxs) { if (netdev->rxs) {
xengnttab_unmap(netdev->xendev.gnttabdev, netdev->rxs, 1); xen_be_unmap_grant_ref(&netdev->xendev, netdev->rxs);
netdev->rxs = NULL; netdev->rxs = NULL;
} }
} }

37
hw/usb/xen-usb.c
View File

@ -173,8 +173,9 @@ static int usbback_gnttab_map(struct usbback_req *usbback_req)
for (i = 0; i < usbback_req->nr_buffer_segs; i++) { for (i = 0; i < usbback_req->nr_buffer_segs; i++) {
ref[i] = usbback_req->req.seg[i].gref; ref[i] = usbback_req->req.seg[i].gref;
} }
usbback_req->buffer = xengnttab_map_domain_grant_refs(xendev->gnttabdev, usbback_req->buffer =
usbback_req->nr_buffer_segs, xendev->dom, ref, prot); xen_be_map_grant_refs(xendev, ref, usbback_req->nr_buffer_segs,
prot);
if (!usbback_req->buffer) { if (!usbback_req->buffer) {
return -ENOMEM; return -ENOMEM;
@ -206,8 +207,9 @@ static int usbback_gnttab_map(struct usbback_req *usbback_req)
for (i = 0; i < usbback_req->nr_extra_segs; i++) { for (i = 0; i < usbback_req->nr_extra_segs; i++) {
ref[i] = usbback_req->req.seg[i + usbback_req->req.nr_buffer_segs].gref; ref[i] = usbback_req->req.seg[i + usbback_req->req.nr_buffer_segs].gref;
} }
usbback_req->isoc_buffer = xengnttab_map_domain_grant_refs( usbback_req->isoc_buffer =
xendev->gnttabdev, usbback_req->nr_extra_segs, xendev->dom, ref, prot); xen_be_map_grant_refs(xendev, ref, usbback_req->nr_extra_segs,
prot);
if (!usbback_req->isoc_buffer) { if (!usbback_req->isoc_buffer) {
return -ENOMEM; return -ENOMEM;
@ -291,14 +293,14 @@ static void usbback_do_response(struct usbback_req *usbback_req, int32_t status,
} }
if (usbback_req->buffer) { if (usbback_req->buffer) {
xengnttab_unmap(xendev->gnttabdev, usbback_req->buffer, xen_be_unmap_grant_refs(xendev, usbback_req->buffer,
usbback_req->nr_buffer_segs); usbback_req->nr_buffer_segs);
usbback_req->buffer = NULL; usbback_req->buffer = NULL;
} }
if (usbback_req->isoc_buffer) { if (usbback_req->isoc_buffer) {
xengnttab_unmap(xendev->gnttabdev, usbback_req->isoc_buffer, xen_be_unmap_grant_refs(xendev, usbback_req->isoc_buffer,
usbback_req->nr_extra_segs); usbback_req->nr_extra_segs);
usbback_req->isoc_buffer = NULL; usbback_req->isoc_buffer = NULL;
} }
@ -834,11 +836,11 @@ static void usbback_disconnect(struct XenDevice *xendev)
xen_pv_unbind_evtchn(xendev); xen_pv_unbind_evtchn(xendev);
if (usbif->urb_sring) { if (usbif->urb_sring) {
xengnttab_unmap(xendev->gnttabdev, usbif->urb_sring, 1); xen_be_unmap_grant_ref(xendev, usbif->urb_sring);
usbif->urb_sring = NULL; usbif->urb_sring = NULL;
} }
if (usbif->conn_sring) { if (usbif->conn_sring) {
xengnttab_unmap(xendev->gnttabdev, usbif->conn_sring, 1); xen_be_unmap_grant_ref(xendev, usbif->conn_sring);
usbif->conn_sring = NULL; usbif->conn_sring = NULL;
} }
@ -877,12 +879,10 @@ static int usbback_connect(struct XenDevice *xendev)
return -1; return -1;
} }
usbif->urb_sring = xengnttab_map_grant_ref(xendev->gnttabdev, xendev->dom, usbif->urb_sring = xen_be_map_grant_ref(xendev, urb_ring_ref,
urb_ring_ref, PROT_READ | PROT_WRITE);
PROT_READ | PROT_WRITE); usbif->conn_sring = xen_be_map_grant_ref(xendev, conn_ring_ref,
usbif->conn_sring = xengnttab_map_grant_ref(xendev->gnttabdev, xendev->dom, PROT_READ | PROT_WRITE);
conn_ring_ref,
PROT_READ | PROT_WRITE);
if (!usbif->urb_sring || !usbif->conn_sring) { if (!usbif->urb_sring || !usbif->conn_sring) {
xen_pv_printf(xendev, 0, "error mapping rings\n"); xen_pv_printf(xendev, 0, "error mapping rings\n");
usbback_disconnect(xendev); usbback_disconnect(xendev);
@ -1024,10 +1024,7 @@ static void usbback_alloc(struct XenDevice *xendev)
/* max_grants: for each request and for the rings (request and connect). */ /* max_grants: for each request and for the rings (request and connect). */
max_grants = USBIF_MAX_SEGMENTS_PER_REQUEST * USB_URB_RING_SIZE + 2; max_grants = USBIF_MAX_SEGMENTS_PER_REQUEST * USB_URB_RING_SIZE + 2;
if (xengnttab_set_max_grants(xendev->gnttabdev, max_grants) < 0) { xen_be_set_max_grant_refs(xendev, max_grants);
xen_pv_printf(xendev, 0, "xengnttab_set_max_grants failed: %s\n",
strerror(errno));
}
} }
static int usbback_free(struct XenDevice *xendev) static int usbback_free(struct XenDevice *xendev)

178
hw/xen/xen_backend.c
View File

@ -44,9 +44,9 @@ BusState *xen_sysbus;
/* public */ /* public */
struct xs_handle *xenstore = NULL; struct xs_handle *xenstore = NULL;
const char *xen_protocol; const char *xen_protocol;
bool xen_feature_grant_copy;
/* private */ /* private */
static bool xen_feature_grant_copy;
static int debug; static int debug;
int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const char *val) int xenstore_write_be_str(struct XenDevice *xendev, const char *node, const char *val)
@ -106,6 +106,156 @@ int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state)
return 0; return 0;
} }
void xen_be_set_max_grant_refs(struct XenDevice *xendev,
unsigned int nr_refs)
{
assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV);
if (xengnttab_set_max_grants(xendev->gnttabdev, nr_refs)) {
xen_pv_printf(xendev, 0, "xengnttab_set_max_grants failed: %s\n",
strerror(errno));
}
}
void *xen_be_map_grant_refs(struct XenDevice *xendev, uint32_t *refs,
unsigned int nr_refs, int prot)
{
void *ptr;
assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV);
ptr = xengnttab_map_domain_grant_refs(xendev->gnttabdev, nr_refs,
xen_domid, refs, prot);
if (!ptr) {
xen_pv_printf(xendev, 0,
"xengnttab_map_domain_grant_refs failed: %s\n",
strerror(errno));
}
return ptr;
}
void xen_be_unmap_grant_refs(struct XenDevice *xendev, void *ptr,
unsigned int nr_refs)
{
assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV);
if (xengnttab_unmap(xendev->gnttabdev, ptr, nr_refs)) {
xen_pv_printf(xendev, 0, "xengnttab_unmap failed: %s\n",
strerror(errno));
}
}
static int compat_copy_grant_refs(struct XenDevice *xendev,
bool to_domain,
XenGrantCopySegment segs[],
unsigned int nr_segs)
{
uint32_t *refs = g_new(uint32_t, nr_segs);
int prot = to_domain ? PROT_WRITE : PROT_READ;
void *pages;
unsigned int i;
for (i = 0; i < nr_segs; i++) {
XenGrantCopySegment *seg = &segs[i];
refs[i] = to_domain ?
seg->dest.foreign.ref : seg->source.foreign.ref;
}
pages = xengnttab_map_domain_grant_refs(xendev->gnttabdev, nr_segs,
xen_domid, refs, prot);
if (!pages) {
xen_pv_printf(xendev, 0,
"xengnttab_map_domain_grant_refs failed: %s\n",
strerror(errno));
g_free(refs);
return -1;
}
for (i = 0; i < nr_segs; i++) {
XenGrantCopySegment *seg = &segs[i];
void *page = pages + (i * XC_PAGE_SIZE);
if (to_domain) {
memcpy(page + seg->dest.foreign.offset, seg->source.virt,
seg->len);
} else {
memcpy(seg->dest.virt, page + seg->source.foreign.offset,
seg->len);
}
}
if (xengnttab_unmap(xendev->gnttabdev, pages, nr_segs)) {
xen_pv_printf(xendev, 0, "xengnttab_unmap failed: %s\n",
strerror(errno));
}
g_free(refs);
return 0;
}
int xen_be_copy_grant_refs(struct XenDevice *xendev,
bool to_domain,
XenGrantCopySegment segs[],
unsigned int nr_segs)
{
xengnttab_grant_copy_segment_t *xengnttab_segs;
unsigned int i;
int rc;
assert(xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV);
if (!xen_feature_grant_copy) {
return compat_copy_grant_refs(xendev, to_domain, segs, nr_segs);
}
xengnttab_segs = g_new0(xengnttab_grant_copy_segment_t, nr_segs);
for (i = 0; i < nr_segs; i++) {
XenGrantCopySegment *seg = &segs[i];
xengnttab_grant_copy_segment_t *xengnttab_seg = &xengnttab_segs[i];
if (to_domain) {
xengnttab_seg->flags = GNTCOPY_dest_gref;
xengnttab_seg->dest.foreign.domid = xen_domid;
xengnttab_seg->dest.foreign.ref = seg->dest.foreign.ref;
xengnttab_seg->dest.foreign.offset = seg->dest.foreign.offset;
xengnttab_seg->source.virt = seg->source.virt;
} else {
xengnttab_seg->flags = GNTCOPY_source_gref;
xengnttab_seg->source.foreign.domid = xen_domid;
xengnttab_seg->source.foreign.ref = seg->source.foreign.ref;
xengnttab_seg->source.foreign.offset =
seg->source.foreign.offset;
xengnttab_seg->dest.virt = seg->dest.virt;
}
xengnttab_seg->len = seg->len;
}
rc = xengnttab_grant_copy(xendev->gnttabdev, nr_segs, xengnttab_segs);
if (rc) {
xen_pv_printf(xendev, 0, "xengnttab_copy failed: %s\n",
strerror(errno));
}
for (i = 0; i < nr_segs; i++) {
xengnttab_grant_copy_segment_t *xengnttab_seg =
&xengnttab_segs[i];
if (xengnttab_seg->status != GNTST_okay) {
xen_pv_printf(xendev, 0, "segment[%u] status: %d\n", i,
xengnttab_seg->status);
rc = -1;
}
}
g_free(xengnttab_segs);
return rc;
}
/* /*
* get xen backend device, allocate a new one if it doesn't exist. * get xen backend device, allocate a new one if it doesn't exist.
*/ */
@ -149,18 +299,6 @@ static struct XenDevice *xen_be_get_xendev(const char *type, int dom, int dev,
} }
qemu_set_cloexec(xenevtchn_fd(xendev->evtchndev)); qemu_set_cloexec(xenevtchn_fd(xendev->evtchndev));
if (ops->flags & DEVOPS_FLAG_NEED_GNTDEV) {
xendev->gnttabdev = xengnttab_open(NULL, 0);
if (xendev->gnttabdev == NULL) {
xen_pv_printf(NULL, 0, "can't open gnttab device\n");
xenevtchn_close(xendev->evtchndev);
qdev_unplug(DEVICE(xendev), NULL);
return NULL;
}
} else {
xendev->gnttabdev = NULL;
}
xen_pv_insert_xendev(xendev); xen_pv_insert_xendev(xendev);
if (xendev->ops->alloc) { if (xendev->ops->alloc) {
@ -322,6 +460,16 @@ static int xen_be_try_initialise(struct XenDevice *xendev)
} }
} }
if (xendev->ops->flags & DEVOPS_FLAG_NEED_GNTDEV) {
xendev->gnttabdev = xengnttab_open(NULL, 0);
if (xendev->gnttabdev == NULL) {
xen_pv_printf(NULL, 0, "can't open gnttab device\n");
return -1;
}
} else {
xendev->gnttabdev = NULL;
}
if (xendev->ops->initialise) { if (xendev->ops->initialise) {
rc = xendev->ops->initialise(xendev); rc = xendev->ops->initialise(xendev);
} }
@ -369,6 +517,10 @@ static void xen_be_disconnect(struct XenDevice *xendev, enum xenbus_state state)
xendev->ops->disconnect) { xendev->ops->disconnect) {
xendev->ops->disconnect(xendev); xendev->ops->disconnect(xendev);
} }
if (xendev->gnttabdev) {
xengnttab_close(xendev->gnttabdev);
xendev->gnttabdev = NULL;
}
if (xendev->be_state != state) { if (xendev->be_state != state) {
xen_be_set_state(xendev, state); xen_be_set_state(xendev, state);
} }

2
hw/xen/xen_pt.c
View File

@ -907,7 +907,7 @@ out:
} }
} }
memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); memory_listener_register(&s->memory_listener, &address_space_memory);
memory_listener_register(&s->io_listener, &address_space_io); memory_listener_register(&s->io_listener, &address_space_io);
s->listener_set = true; s->listener_set = true;
XEN_PT_LOG(d, XEN_PT_LOG(d,

2
hw/xen/xen_pt_config_init.c
View File

@ -504,6 +504,8 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry,
bar_ro_mask = XEN_PT_BAR_IO_RO_MASK | (r_size - 1); bar_ro_mask = XEN_PT_BAR_IO_RO_MASK | (r_size - 1);
break; break;
case XEN_PT_BAR_FLAG_UPPER: case XEN_PT_BAR_FLAG_UPPER:
assert(index > 0);
r_size = d->io_regions[index - 1].size >> 32;
bar_emu_mask = XEN_PT_BAR_ALLF; bar_emu_mask = XEN_PT_BAR_ALLF;
bar_ro_mask = r_size ? r_size - 1 : 0; bar_ro_mask = r_size ? r_size - 1 : 0;
break; break;

34
include/hw/xen/xen_backend.h
View File

@ -16,7 +16,6 @@
/* variables */ /* variables */
extern struct xs_handle *xenstore; extern struct xs_handle *xenstore;
extern const char *xen_protocol; extern const char *xen_protocol;
extern bool xen_feature_grant_copy;
extern DeviceState *xen_sysdev; extern DeviceState *xen_sysdev;
extern BusState *xen_sysbus; extern BusState *xen_sysbus;
@ -42,6 +41,39 @@ void xen_be_register_common(void);
int xen_be_register(const char *type, struct XenDevOps *ops); int xen_be_register(const char *type, struct XenDevOps *ops);
int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state); int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state);
int xen_be_bind_evtchn(struct XenDevice *xendev); int xen_be_bind_evtchn(struct XenDevice *xendev);
void xen_be_set_max_grant_refs(struct XenDevice *xendev,
unsigned int nr_refs);
void *xen_be_map_grant_refs(struct XenDevice *xendev, uint32_t *refs,
unsigned int nr_refs, int prot);
void xen_be_unmap_grant_refs(struct XenDevice *xendev, void *ptr,
unsigned int nr_refs);
typedef struct XenGrantCopySegment {
union {
void *virt;
struct {
uint32_t ref;
off_t offset;
} foreign;
} source, dest;
size_t len;
} XenGrantCopySegment;
int xen_be_copy_grant_refs(struct XenDevice *xendev,
bool to_domain, XenGrantCopySegment segs[],
unsigned int nr_segs);
static inline void *xen_be_map_grant_ref(struct XenDevice *xendev,
uint32_t ref, int prot)
{
return xen_be_map_grant_refs(xendev, &ref, 1, prot);
}
static inline void xen_be_unmap_grant_ref(struct XenDevice *xendev,
void *ptr)
{
return xen_be_unmap_grant_refs(xendev, ptr, 1);
}
/* actual backend drivers */ /* actual backend drivers */
extern struct XenDevOps xen_console_ops; /* xen_console.c */ extern struct XenDevOps xen_console_ops; /* xen_console.c */

15
include/hw/xen/xen_common.h
View File

@ -667,8 +667,21 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40800 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40800
struct xengnttab_grant_copy_segment {
union xengnttab_copy_ptr {
void *virt;
struct {
uint32_t ref;
uint16_t offset;
uint16_t domid;
} foreign;
} source, dest;
uint16_t len;
uint16_t flags;
int16_t status;
};
typedef void *xengnttab_grant_copy_segment_t; typedef struct xengnttab_grant_copy_segment xengnttab_grant_copy_segment_t;
static inline int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, static inline int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count,
xengnttab_grant_copy_segment_t *segs) xengnttab_grant_copy_segment_t *segs)

2
scripts/checkpatch.pl
View File

@ -271,7 +271,7 @@ our @typeList = (
qr{hwaddr}, qr{hwaddr},
# external libraries # external libraries
qr{xml${Ident}}, qr{xml${Ident}},
qr{xendevicemodel_handle}, qr{xen\w+_handle},
# Glib definitions # Glib definitions
qr{gchar}, qr{gchar},
qr{gshort}, qr{gshort},