From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v8 4/9] libxc: Introduce xc_domain_setvnuma to set vNUMA Date: Wed, 27 Aug 2014 16:31:15 -0400 Message-ID: <20140827203115.GD10321@laptop.dumpdata.com> References: <1409039106-955-1-git-send-email-ufimtseva@gmail.com> <1409039106-955-2-git-send-email-ufimtseva@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1409039106-955-2-git-send-email-ufimtseva@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Elena Ufimtseva Cc: keir@xen.org, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, george.dunlap@eu.citrix.com, msw@linux.com, dario.faggioli@citrix.com, lccycc123@gmail.com, ian.jackson@eu.citrix.com, xen-devel@lists.xen.org, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org On Tue, Aug 26, 2014 at 03:45:01AM -0400, Elena Ufimtseva wrote: > With the introduction of the XEN_DOMCTL_setvnumainfo > in patch titled: "xen: vnuma topology and subop hypercalls" > we put in the plumbing here to use from the toolstack. The user > is allowed to call this multiple times if they wish so. > It will error out if the nr_vnodes or nr_vcpus is zero. > > Signed-off-by: Elena Ufimtseva Reviewed-by: Konrad Rzeszutek Wilk > --- > tools/libxc/xc_domain.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ > tools/libxc/xenctrl.h | 10 ++++++++ > 2 files changed, 75 insertions(+) > > diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c > index c67ac9a..1708766 100644 > --- a/tools/libxc/xc_domain.c > +++ b/tools/libxc/xc_domain.c > @@ -2124,6 +2124,71 @@ int xc_domain_set_max_evtchn(xc_interface *xch, uint32_t domid, > return do_domctl(xch, &domctl); > } > > +/* Plumbing Xen with vNUMA topology */ > +int xc_domain_setvnuma(xc_interface *xch, > + uint32_t domid, > + uint32_t nr_vnodes, > + uint32_t nr_regions, > + uint32_t nr_vcpus, > + vmemrange_t *vmemrange, > + unsigned int *vdistance, > + unsigned int *vcpu_to_vnode, > + unsigned int *vnode_to_pnode) > +{ > + int rc; > + DECLARE_DOMCTL; > + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * nr_regions, > + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); > + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * > + nr_vnodes * nr_vnodes, > + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); > + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * nr_vcpus, > + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); > + DECLARE_HYPERCALL_BOUNCE(vnode_to_pnode, sizeof(*vnode_to_pnode) * > + nr_vnodes, > + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); > + errno = EINVAL; > + > + if ( nr_vnodes == 0 || nr_regions == 0 || nr_regions < nr_vnodes ) > + return -1; > + > + if ( !vdistance || !vcpu_to_vnode || !vmemrange || !vnode_to_pnode ) > + { > + PERROR("%s: Cant set vnuma without initializing topology", __func__); > + return -1; > + } > + > + if ( xc_hypercall_bounce_pre(xch, vmemrange) || > + xc_hypercall_bounce_pre(xch, vdistance) || > + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) || > + xc_hypercall_bounce_pre(xch, vnode_to_pnode) ) > + { > + rc = -1; > + goto vnumaset_fail; > + > + } > + > + set_xen_guest_handle(domctl.u.vnuma.vmemrange, vmemrange); > + set_xen_guest_handle(domctl.u.vnuma.vdistance, vdistance); > + set_xen_guest_handle(domctl.u.vnuma.vcpu_to_vnode, vcpu_to_vnode); > + set_xen_guest_handle(domctl.u.vnuma.vnode_to_pnode, vnode_to_pnode); > + > + domctl.cmd = XEN_DOMCTL_setvnumainfo; > + domctl.domain = (domid_t)domid; > + domctl.u.vnuma.nr_vnodes = nr_vnodes; > + domctl.u.vnuma.nr_regions = nr_regions; > + > + rc = do_domctl(xch, &domctl); > + > + vnumaset_fail: > + xc_hypercall_bounce_post(xch, vmemrange); > + xc_hypercall_bounce_post(xch, vdistance); > + xc_hypercall_bounce_post(xch, vcpu_to_vnode); > + xc_hypercall_bounce_post(xch, vnode_to_pnode); > + > + return rc; > +} > + > /* > * Local variables: > * mode: C > diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h > index 1c5d0db..1c8aa42 100644 > --- a/tools/libxc/xenctrl.h > +++ b/tools/libxc/xenctrl.h > @@ -1245,6 +1245,16 @@ int xc_domain_set_memmap_limit(xc_interface *xch, > uint32_t domid, > unsigned long map_limitkb); > > +int xc_domain_setvnuma(xc_interface *xch, > + uint32_t domid, > + uint32_t nr_vnodes, > + uint32_t nr_regions, > + uint32_t nr_vcpus, > + vmemrange_t *vmemrange, > + unsigned int *vdistance, > + unsigned int *vcpu_to_vnode, > + unsigned int *vnode_to_pnode); > + > #if defined(__i386__) || defined(__x86_64__) > /* > * PC BIOS standard E820 types and structure. > -- > 1.7.10.4 >