From patchwork Sun Apr 10 21:14:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8795241 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1C4029F71A for ; Sun, 10 Apr 2016 21:18:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94ED020125 for ; Sun, 10 Apr 2016 21:18:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1913520221 for ; Sun, 10 Apr 2016 21:18:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apMhT-00086g-F6; Sun, 10 Apr 2016 21:15:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apMhR-00084y-Ax for xen-devel@lists.xenproject.org; Sun, 10 Apr 2016 21:15:17 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 59/F6-04050-462CA075; Sun, 10 Apr 2016 21:15:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeJIrShJLcpLzFFi42LpnVTnqpt8iCv coHuNocX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnH5p2XBorqKedv6mRoYH8V1MXJxCAlMZJL4 uWULI4TzhVHi3cXt7BDORkaJ7p3bWCGcbkaJ73cuMnUxcgI5RRKrT09j7mLk4GATMJF4s8oRp EZEYDmjxNd9c8AamAVOMkpc+nqZHaRBWMBL4nj7L1YQm0VAVeLl6ifMIDavgKvEr0fHWUAGSQ jISSy4kA5icgq4Scw8rAGxylXiyP57YFMkBAwlPm9cyjyBkX8BI8MqRo3i1KKy1CJdQ0O9pKL M9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYzAAGIAgh2Mq387HWKU5GBSEuW1eskRLsSX lJ9SmZFYnBFfVJqTWnyIUYaDQ0mCt+EAV7iQYFFqempFWmYOMJRh0hIcPEoivFdA0rzFBYm5x ZnpEKlTjIpS4rz7QRICIImM0jy4Nlj8XGKUlRLmZQQ6RIinILUoN7MEVf4VozgHo5Iw732QKT yZeSVw018BLWYCWvzsHyfI4pJEhJRUA+OydN2Nnu4zz/99UNxmu6V6g8zrnlcTv5Zc4xXVnur y48jVf5NUb/5fJOtk22DB2GCp9vHQtWdnmGofzZBR2qno3V914D3/H7Uyu2BbSdUaJq849Zm2 9v/Koh4X7drobXrZZ6FCrUxnE+Pc60ondxox3X+41uBQ/AuHGUc/iDz9/09++6y6knAlluKMR EMt5qLiRADt+hhKmgIAAA== X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1460322914!34140611!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48123 invoked from network); 10 Apr 2016 21:15:15 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-8.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Apr 2016 21:15:15 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3ALF7DW015315 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 10 Apr 2016 21:15:07 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u3ALF6OO007734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 10 Apr 2016 21:15:06 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u3ALF56c027252; Sun, 10 Apr 2016 21:15:06 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 10 Apr 2016 14:15:05 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 589BB6A00FA; Sun, 10 Apr 2016 17:15:04 -0400 (EDT) From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, konrad@kernel.org, sasha.levin@oracle.com, andrew.cooper3@citrix.com, ross.lagerwall@citrix.com, mpohlack@amazon.de Date: Sun, 10 Apr 2016 17:14:35 -0400 Message-Id: <1460322896-1115-4-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460322896-1115-1-git-send-email-konrad.wilk@oracle.com> References: <1460322896-1115-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: Wei Liu , Stefano Stabellini , Ian Jackson , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v7 03/24] libxc: Implementation of XEN_XSPLICE_op in libxc X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Ross Lagerwall Acked-by: Wei Liu Reviewed-by: Andrew Cooper --- Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu v2: Actually set zero for the _pad entries. v3: Split status into state and error code. Add REPLACE action. - Use timeout and utilize pads. - Update per Wei's review. - Extra space slipped in, remove it v4: Add Wei's review, update comment and Ack. v7: Sprinkle errno=-EINVAL on all the 'if (!len)', etc checks. Added Reviewed-by from Andrew. --- --- tools/libxc/include/xenctrl.h | 62 ++++++++ tools/libxc/xc_misc.c | 355 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index f5a034a..a7937fa 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2640,6 +2640,68 @@ const uint32_t *xc_get_feature_deep_deps(uint32_t feature); #endif +int xc_xsplice_upload(xc_interface *xch, + char *name, unsigned char *payload, uint32_t size); + +int xc_xsplice_get(xc_interface *xch, + char *name, + xen_xsplice_status_t *status); + +/* + * The heart of this function is to get an array of xen_xsplice_status_t. + * + * However it is complex because it has to deal with the hypervisor + * returning some of the requested data or data being stale + * (another hypercall might alter the list). + * + * The parameters that the function expects to contain data from + * the hypervisor are: 'info', 'name', and 'len'. The 'done' and + * 'left' are also updated with the number of entries filled out + * and respectively the number of entries left to get from hypervisor. + * + * It is expected that the caller of this function will take the + * 'left' and use the value for 'start'. This way we have an + * cursor in the array. Note that the 'info','name', and 'len' will + * be updated at the subsequent calls. + * + * The 'max' is to be provided by the caller with the maximum + * number of entries that 'info', 'name', and 'len' arrays can + * be filled up with. + * + * Each entry in the 'name' array is expected to be of XEN_XSPLICE_NAME_SIZE + * length. + * + * Each entry in the 'info' array is expected to be of xen_xsplice_status_t + * structure size. + * + * Each entry in the 'len' array is expected to be of uint32_t size. + * + * The return value is zero if the hypercall completed successfully. + * Note that the return value is _not_ the amount of entries filled + * out - that is saved in 'done'. + * + * If there was an error performing the operation, the return value + * will contain an negative -EXX type value. The 'done' and 'left' + * will contain the number of entries that had been succesfully + * retrieved (if any). + */ +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); + +/* + * The operations are asynchronous and the hypervisor may take a while + * to complete them. The `timeout` offers an option to expire the + * operation if it could not be completed within the specified time + * (in ms). Value of 0 means let hypervisor decide the best timeout. + */ +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); + /* Compat shims */ #include "xenctrl_compat.h" diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 7d997d9..8cd398b 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -696,6 +696,361 @@ int xc_hvm_inject_trap( return rc; } +int xc_xsplice_upload(xc_interface *xch, + char *name, + unsigned char *payload, + uint32_t size) +{ + int rc; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BUFFER(char, local); + DECLARE_HYPERCALL_BOUNCE(name, 0 /* later */, XC_HYPERCALL_BUFFER_BOUNCE_IN); + xen_xsplice_name_t def_name = { .pad = { 0, 0, 0 } }; + + if ( !name || !payload ) + { + errno = EINVAL; + return -1; + } + + def_name.size = strlen(name) + 1; + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + { + errno = EINVAL; + return -1; + } + + HYPERCALL_BOUNCE_SET_SIZE(name, def_name.size); + + if ( xc_hypercall_bounce_pre(xch, name) ) + return -1; + + local = xc_hypercall_buffer_alloc(xch, local, size); + if ( !local ) + { + xc_hypercall_bounce_post(xch, name); + return -1; + } + memcpy(local, payload, size); + + 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, local); + + 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_buffer_free(xch, local); + 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 ) + { + errno = EINVAL; + return -1; + } + + def_name.size = strlen(name) + 1; + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + { + errno = EINVAL; + 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; +} + +/* + * The heart of this function is to get an array of xen_xsplice_status_t. + * + * However it is complex because it has to deal with the hypervisor + * returning some of the requested data or data being stale + * (another hypercall might alter the list). + * + * The parameters that the function expects to contain data from + * the hypervisor are: 'info', 'name', and 'len'. The 'done' and + * 'left' are also updated with the number of entries filled out + * and respectively the number of entries left to get from hypervisor. + * + * It is expected that the caller of this function will take the + * 'left' and use the value for 'start'. This way we have an + * cursor in the array. Note that the 'info','name', and 'len' will + * be updated at the subsequent calls. + * + * The 'max' is to be provided by the caller with the maximum + * number of entries that 'info', 'name', and 'len' arrays can + * be filled up with. + * + * Each entry in the 'name' array is expected to be of XEN_XSPLICE_NAME_SIZE + * length. + * + * Each entry in the 'info' array is expected to be of xen_xsplice_status_t + * structure size. + * + * Each entry in the 'len' array is expected to be of uint32_t size. + * + * The return value is zero if the hypercall completed successfully. + * Note that the return value is _not_ the amount of entries filled + * out - that is saved in 'done'. + * + * If there was an error performing the operation, the return value + * will contain an negative -EXX type value. The 'done' and 'left' + * will contain the number of entries that had been succesfully + * retrieved (if any). + */ +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; + /* The sizes are adjusted later - hence zero. */ + DECLARE_HYPERCALL_BOUNCE(info, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(name, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(len, 0, XC_HYPERCALL_BUFFER_BOUNCE_OUT); + uint32_t max_batch_sz, nr; + uint32_t version = 0, retries = 0; + uint32_t adjust = 0; + ssize_t sz; + + if ( !max || !info || !name || !len ) + { + errno = EINVAL; + 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; + /* Convience value. */ + sz = sizeof(*name) * XEN_XSPLICE_NAME_SIZE; + *done = 0; + *left = 0; + do { + /* + * The first time we go in this loop our 'max' may be bigger + * than what the hypervisor is comfortable with - hence the first + * couple of loops may adjust the number of entries we will + * want filled (tracked by 'nr'). + * + * N.B. This is a do { } while loop and the right hand side of + * the conditional when adjusting will evaluate to false (as + * *left is set to zero before the loop. Hence we need this + * adjust - even if we reset it at the start of the loop. + */ + 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 * nr); + 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 + (sz * *done); + (HYPERCALL_BUFFER(len))->ubuf = len + *done; + /* Allocate memory. */ + rc = xc_hypercall_bounce_pre(xch, info); + if ( rc ) + break; + + rc = xc_hypercall_bounce_pre(xch, name); + if ( rc ) + break; + + rc = xc_hypercall_bounce_pre(xch, len); + if ( rc ) + break; + + 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 ) + { + /* We could make this configurable as parameter? */ + 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 = EOVERFLOW; /* 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 * sz)); + 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; + /* The size is figured out when we strlen(name) */ + DECLARE_HYPERCALL_BOUNCE(name, 0, XC_HYPERCALL_BUFFER_BOUNCE_IN); + xen_xsplice_name_t def_name = { .pad = { 0, 0, 0 } }; + + def_name.size = strlen(name) + 1; + + if ( def_name.size > XEN_XSPLICE_NAME_SIZE ) + { + errno = EINVAL; + 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