[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v2 04/13] libxc: Implementation of XEN_XSPLICE_op in libxc (v4).
The underlaying toolstack code to do the basic operations when using the XEN_XSPLICE_op syscalls: - upload the payload, - get status of an payload, - list all the payloads, - apply, check, replace, and revert the payload. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx> --- v2: Actually set zero for the _pad entries. v3: Split status into state and error code. Add REPLACE action. v4: Use timeout and utilize pads. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> --- tools/libxc/include/xenctrl.h | 18 +++ tools/libxc/xc_misc.c | 284 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 01a6dda..bb80c8d 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2851,6 +2851,24 @@ int xc_psr_cat_get_l3_info(xc_interface *xch, uint32_t socket, bool *cdp_enabled); #endif +int xc_xsplice_upload(xc_interface *xch, + char *name, char *payload, uint32_t size); + +int xc_xsplice_get(xc_interface *xch, + char *name, + xen_xsplice_status_t *status); + +int xc_xsplice_list(xc_interface *xch, unsigned int max, unsigned int start, + xen_xsplice_status_t *info, char *name, + uint32_t *len, unsigned int *done, + unsigned int *left); + +int xc_xsplice_apply(xc_interface *xch, char *name, uint32_t timeout); +int xc_xsplice_revert(xc_interface *xch, char *name, uint32_t timeout); +int xc_xsplice_unload(xc_interface *xch, char *name, uint32_t timeout); +int xc_xsplice_check(xc_interface *xch, char *name, uint32_t timeout); +int xc_xsplice_replace(xc_interface *xch, char *name, uint32_t timeout); + #endif /* XENCTRL_H */ /* diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index c613545..beadcb1 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -718,6 +718,290 @@ int xc_hvm_inject_trap( return rc; } +int xc_xsplice_upload(xc_interface *xch, + char *name, + char *payload, + uint32_t size) +{ + int rc; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(payload, size, XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(name, 0 /* adjust later */, XC_HYPERCALL_BUFFER_BOUNCE_IN); + xen_xsplice_name_t def_name = { .pad = { 0, 0, 0 } }; + + if ( !name || !payload ) + return -1; + + def_name.size = strlen(name); + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + return -1; + + HYPERCALL_BOUNCE_SET_SIZE(name, def_name.size ); + + if ( xc_hypercall_bounce_pre(xch, name) ) + return -1; + + if ( xc_hypercall_bounce_pre(xch, payload) ) + return -1; + + sysctl.cmd = XEN_SYSCTL_xsplice_op; + sysctl.u.xsplice.cmd = XEN_SYSCTL_XSPLICE_UPLOAD; + sysctl.u.xsplice.pad = 0; + sysctl.u.xsplice.u.upload.size = size; + set_xen_guest_handle(sysctl.u.xsplice.u.upload.payload, payload); + + sysctl.u.xsplice.u.upload.name = def_name; + set_xen_guest_handle(sysctl.u.xsplice.u.upload.name.name, name); + + rc = do_sysctl(xch, &sysctl); + + xc_hypercall_bounce_post(xch, payload); + xc_hypercall_bounce_post(xch, name); + + return rc; +} + +int xc_xsplice_get(xc_interface *xch, + char *name, + xen_xsplice_status_t *status) +{ + int rc; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(name, 0 /*adjust later */, XC_HYPERCALL_BUFFER_BOUNCE_IN); + xen_xsplice_name_t def_name = { .pad = { 0, 0, 0 } }; + + if ( !name ) + return -1; + + def_name.size = strlen(name); + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + return -1; + + HYPERCALL_BOUNCE_SET_SIZE(name, def_name.size ); + + if ( xc_hypercall_bounce_pre(xch, name) ) + return -1; + + sysctl.cmd = XEN_SYSCTL_xsplice_op; + sysctl.u.xsplice.cmd = XEN_SYSCTL_XSPLICE_GET; + sysctl.u.xsplice.pad = 0; + + sysctl.u.xsplice.u.get.status.state = 0; + sysctl.u.xsplice.u.get.status.rc = 0; + + sysctl.u.xsplice.u.get.name = def_name; + set_xen_guest_handle(sysctl.u.xsplice.u.get.name.name, name); + + rc = do_sysctl(xch, &sysctl); + + xc_hypercall_bounce_post(xch, name); + + memcpy(status, &sysctl.u.xsplice.u.get.status, sizeof(*status)); + + return rc; +} + +int xc_xsplice_list(xc_interface *xch, unsigned int max, unsigned int start, + xen_xsplice_status_t *info, + char *name, uint32_t *len, + unsigned int *done, + unsigned int *left) +{ + int rc; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(info, 0 /* adjust later. */, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(name, 0 /* adjust later. */, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(len, 0 /* adjust later. */, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + uint32_t max_batch_sz, nr; + uint32_t version = 0, retries = 0; + uint32_t adjust = 0; + + if ( !max || !info || !name || !len ) + return -1; + + sysctl.cmd = XEN_SYSCTL_xsplice_op; + sysctl.u.xsplice.cmd = XEN_SYSCTL_XSPLICE_LIST; + sysctl.u.xsplice.pad = 0; + sysctl.u.xsplice.u.list.version = 0; + sysctl.u.xsplice.u.list.idx = start; + sysctl.u.xsplice.u.list.pad = 0; + + max_batch_sz = max; + + *done = 0; + *left = 0; + do { + if ( adjust ) + adjust = 0; /* Used when adjusting the 'max_batch_sz' or 'retries'. */ + + nr = min(max - *done, max_batch_sz); + + sysctl.u.xsplice.u.list.nr = nr; + /* Fix the size (may vary between hypercalls). */ + HYPERCALL_BOUNCE_SET_SIZE(info, nr * sizeof(*info)); + HYPERCALL_BOUNCE_SET_SIZE(name, nr * sizeof(*name) * XEN_XSPLICE_NAME_SIZE); + HYPERCALL_BOUNCE_SET_SIZE(len, nr * sizeof(*len)); + /* Move the pointer to proper offset into 'info'. */ + (HYPERCALL_BUFFER(info))->ubuf = info + *done; + (HYPERCALL_BUFFER(name))->ubuf = name + (sizeof(*name) * XEN_XSPLICE_NAME_SIZE * *done); + (HYPERCALL_BUFFER(len))->ubuf = len + *done; + /* Allocate memory. */ + rc = xc_hypercall_bounce_pre(xch, info); + if ( rc ) + return rc; + + rc = xc_hypercall_bounce_pre(xch, name); + if ( rc ) + { + xc_hypercall_bounce_post(xch, info); + return rc; + } + rc = xc_hypercall_bounce_pre(xch, len); + if ( rc ) + { + xc_hypercall_bounce_post(xch, info); + xc_hypercall_bounce_post(xch, name); + return rc; + } + set_xen_guest_handle(sysctl.u.xsplice.u.list.status, info); + set_xen_guest_handle(sysctl.u.xsplice.u.list.name, name); + set_xen_guest_handle(sysctl.u.xsplice.u.list.len, len); + + rc = do_sysctl(xch, &sysctl); + /* + * From here on we MUST call xc_hypercall_bounce. If rc < 0 we + * end up doing it (outside the loop), so using a break is OK. + */ + if ( rc < 0 && errno == E2BIG ) + { + if ( max_batch_sz <= 1 ) + break; + max_batch_sz >>= 1; + adjust = 1; /* For the loop conditional to let us loop again. */ + /* No memory leaks! */ + xc_hypercall_bounce_post(xch, info); + xc_hypercall_bounce_post(xch, name); + xc_hypercall_bounce_post(xch, len); + continue; + } + else if ( rc < 0 ) /* For all other errors we bail out. */ + break; + + if ( !version ) + version = sysctl.u.xsplice.u.list.version; + + if ( sysctl.u.xsplice.u.list.version != version ) + { + /* TODO: retries should be configurable? */ + if ( retries++ > 3 ) + { + rc = -1; + errno = EBUSY; + break; + } + *done = 0; /* Retry from scratch. */ + version = sysctl.u.xsplice.u.list.version; + adjust = 1; /* And make sure we continue in the loop. */ + /* No memory leaks. */ + xc_hypercall_bounce_post(xch, info); + xc_hypercall_bounce_post(xch, name); + xc_hypercall_bounce_post(xch, len); + continue; + } + + /* We should never hit this, but just in case. */ + if ( rc > nr ) + { + errno = EINVAL; /* Overflow! */ + rc = -1; + break; + } + *left = sysctl.u.xsplice.u.list.nr; /* Total remaining count. */ + /* Copy only up 'rc' of data' - we could add 'min(rc,nr) if desired. */ + HYPERCALL_BOUNCE_SET_SIZE(info, (rc * sizeof(*info))); + HYPERCALL_BOUNCE_SET_SIZE(name, (rc * sizeof(*name) * XEN_XSPLICE_NAME_SIZE)); + HYPERCALL_BOUNCE_SET_SIZE(len, (rc * sizeof(*len))); + /* Bounce the data and free the bounce buffer. */ + xc_hypercall_bounce_post(xch, info); + xc_hypercall_bounce_post(xch, name); + xc_hypercall_bounce_post(xch, len); + /* And update how many elements of info we have copied into. */ + *done += rc; + /* Update idx. */ + sysctl.u.xsplice.u.list.idx = *done; + } while ( adjust || (*done < max && *left != 0) ); + + if ( rc < 0 ) + { + xc_hypercall_bounce_post(xch, len); + xc_hypercall_bounce_post(xch, name); + xc_hypercall_bounce_post(xch, info); + } + + return rc > 0 ? 0 : rc; +} + +static int _xc_xsplice_action(xc_interface *xch, + char *name, + unsigned int action, + uint32_t timeout) +{ + int rc; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(name, 0 /* adjust later */, XC_HYPERCALL_BUFFER_BOUNCE_IN); + xen_xsplice_name_t def_name = { .pad = { 0, 0, 0 } }; + + def_name.size = strlen(name); + + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + return -1; + + HYPERCALL_BOUNCE_SET_SIZE(name, def_name.size); + + if ( xc_hypercall_bounce_pre(xch, name) ) + return -1; + + sysctl.cmd = XEN_SYSCTL_xsplice_op; + sysctl.u.xsplice.cmd = XEN_SYSCTL_XSPLICE_ACTION; + sysctl.u.xsplice.pad = 0; + sysctl.u.xsplice.u.action.cmd = action; + sysctl.u.xsplice.u.action.timeout = timeout; + + sysctl.u.xsplice.u.action.name = def_name; + set_xen_guest_handle(sysctl.u.xsplice.u.action.name.name, name); + + rc = do_sysctl(xch, &sysctl); + + xc_hypercall_bounce_post(xch, name); + + return rc; +} + +int xc_xsplice_apply(xc_interface *xch, char *name, uint32_t timeout) +{ + return _xc_xsplice_action(xch, name, XSPLICE_ACTION_APPLY, timeout); +} + +int xc_xsplice_revert(xc_interface *xch, char *name, uint32_t timeout) +{ + return _xc_xsplice_action(xch, name, XSPLICE_ACTION_REVERT, timeout); +} + +int xc_xsplice_unload(xc_interface *xch, char *name, uint32_t timeout) +{ + return _xc_xsplice_action(xch, name, XSPLICE_ACTION_UNLOAD, timeout); +} + +int xc_xsplice_check(xc_interface *xch, char *name, uint32_t timeout) +{ + return _xc_xsplice_action(xch, name, XSPLICE_ACTION_CHECK, timeout); +} + +int xc_xsplice_replace(xc_interface *xch, char *name, uint32_t timeout) +{ + return _xc_xsplice_action(xch, name, XSPLICE_ACTION_REPLACE, timeout); +} + /* * Local variables: * mode: C -- 2.1.0 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |