@@ -219,6 +219,7 @@ static int con_initialise(struct XenDevice *xendev)
{
struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
int limit;
+ int err;
if (xenstore_read_int(con->console, "ring-ref", &con->ring_ref) == -1)
return -1;
@@ -228,10 +229,10 @@ static int con_initialise(struct XenDevice *xendev)
con->buffer.max_capacity = limit;
if (!xendev->dev) {
- con->sring = xc_map_foreign_range(xen_xc, con->xendev.dom,
- XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE,
- con->ring_ref);
+ xen_pfn_t mfn = con->ring_ref;
+ con->sring = xc_map_foreign_bulk(xen_xc, con->xendev.dom,
+ PROT_READ|PROT_WRITE,
+ &mfn, &err, 1);
} else {
con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom,
con->ring_ref,
@@ -96,6 +96,7 @@ struct XenFB {
static int common_bind(struct common *c)
{
uint64_t mfn;
+ int err;
if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1)
return -1;
@@ -104,9 +105,8 @@ static int common_bind(struct common *c)
if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1)
return -1;
- c->page = xc_map_foreign_range(xen_xc, c->xendev.dom,
- XC_PAGE_SIZE,
- PROT_READ | PROT_WRITE, mfn);
+ c->page = xc_map_foreign_bulk(xen_xc, c->xendev.dom,
+ PROT_READ | PROT_WRITE, &mfn, &err, 1);
if (c->page == NULL)
return -1;
@@ -1193,7 +1193,7 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
int xen_hvm_init(PCMachineState *pcms,
MemoryRegion **ram_memory)
{
- int i, rc;
+ int i, rc, map_err;
xen_pfn_t ioreq_pfn;
xen_pfn_t bufioreq_pfn;
evtchn_port_t bufioreq_evtchn;
@@ -1240,33 +1240,35 @@ int xen_hvm_init(PCMachineState *pcms,
DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
- state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE, ioreq_pfn);
+ state->shared_page = xc_map_foreign_bulk(xen_xc, xen_domid,
+ PROT_READ|PROT_WRITE,
+ &ioreq_pfn, &map_err, 1);
if (state->shared_page == NULL) {
- hw_error("map shared IO page returned error %d handle=" XC_INTERFACE_FMT,
- errno, xen_xc);
+ hw_error(
+ "map shared IO page returned error %d(%d) handle=" XC_INTERFACE_FMT,
+ errno, map_err, xen_xc);
}
rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
if (!rc) {
DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
state->shared_vmport_page =
- xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE, ioreq_pfn);
+ xc_map_foreign_bulk(xen_xc, xen_domid, PROT_READ|PROT_WRITE,
+ &ioreq_pfn, &map_err, 1);
if (state->shared_vmport_page == NULL) {
- hw_error("map shared vmport IO page returned error %d handle="
- XC_INTERFACE_FMT, errno, xen_xc);
+ hw_error("map shared vmport IO page returned error %d (%d) handle="
+ XC_INTERFACE_FMT, errno, map_err, xen_xc);
}
} else if (rc != -ENOSYS) {
hw_error("get vmport regs pfn returned error %d, rc=%d", errno, rc);
}
- state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid,
- XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE,
- bufioreq_pfn);
+ state->buffered_io_page = xc_map_foreign_bulk(xen_xc, xen_domid,
+ PROT_READ|PROT_WRITE,
+ &bufioreq_pfn,
+ &map_err, 1);
if (state->buffered_io_page == NULL) {
- hw_error("map buffered IO page returned error %d", errno);
+ hw_error("map buffered IO page returned error %d (%d)", errno, map_err);
}
/* Note: cpus is empty at this point in init */
In Xen 4.7 we are refactoring parts libxenctrl into a number of separate libraries which will provide backward and forward API and ABI compatiblity. One such library will be libxenforeignmemory which provides access to privileged foreign mappings and which will provide an interface equivalent to xc_map_foreign_bulk. In preparation for this switch all uses of xc_map_foreign_range to xc_map_foreign_bulk. This is trivial because size was always XC_PAGE_SIZE so the necessary adjustments are trivial: * Pass &mfn (an array of length 1) instead of mfn. The function takes a pointer to const, so there is no possibily of mfn changing due to this change. * Add a local err variable to receive the errors and pass &err (again, an array of length 1) * Adjust any existing logging to include err too * Pass nr_pages=1 instead of size=XC_PAGE_SIZE There is one wrinkle in xen_console.c:con_initialise() where con->ring_ref is an int but can in some code paths (when !xendev->dev) be treated as an mfn. I think this is an existing latent truncation hazard on platforms where xen_pfn_t is 64-bit and int is 32-bit (e.g. amd64, both arm* variants). I'm unsure under what circumstances xendev->dev can be NULL or if anything elsewhere ensures the value fits into an int. For now I just use a temporary xen_pfn_t to in effect upcast the pointer from int* to xen_pfn_t*. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- v4: Ran checkpatch, fixed all errors Mention the const-ness of the mfn array in the commit log --- hw/char/xen_console.c | 9 +++++---- hw/display/xenfb.c | 6 +++--- xen-hvm.c | 30 ++++++++++++++++-------------- 3 files changed, 24 insertions(+), 21 deletions(-)