From patchwork Thu Mar 10 05:27:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 8554071 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 B7BB09FDE3 for ; Thu, 10 Mar 2016 05:30:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 835BC202F0 for ; Thu, 10 Mar 2016 05:30:21 +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 558F7202B8 for ; Thu, 10 Mar 2016 05:30:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adt88-0000Rh-NG; Thu, 10 Mar 2016 05:27:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adt87-0000Rb-9L for xen-devel@lists.xen.org; Thu, 10 Mar 2016 05:27:23 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id AB/67-03645-AB501E65; Thu, 10 Mar 2016 05:27:22 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1457587639!29988467!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1713 invoked from network); 10 Mar 2016 05:27:19 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-9.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 10 Mar 2016 05:27:19 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 34D64ABF9; Thu, 10 Mar 2016 05:27:18 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xen.org Date: Thu, 10 Mar 2016 06:27:14 +0100 Message-Id: <1457587634-22819-4-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1457587634-22819-1-git-send-email-jgross@suse.com> References: <1457587634-22819-1-git-send-email-jgross@suse.com> Cc: Juergen Gross , Wei Liu , Ian Jackson , Stefano Stabellini Subject: [Xen-devel] [PATCH v4 3/3] libxl: add force option for xl vcpu-pin 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=-1.9 required=5.0 tests=BAYES_00, 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 In order to be able to undo a vcpu pin override in case of a kernel driver error add a flag "-f" to the "xl vcpu-pin" command forcing the hypervisor to undo the override. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli Acked-by: Wei Liu --- V4: - change "force" variable to bool as suggested by Dario Faggioli - add #define to libxl indicating availability of libxl_set_vcpuaffinity_force() as requested by Wei Liu - add force option to xl man page as requested by Dario Faggioli --- docs/man/xl.pod.1 | 7 ++++++- tools/libxl/libxl.c | 31 +++++++++++++++++++++++++------ tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/xl_cmdimpl.c | 26 +++++++++++++++++++++++--- tools/libxl/xl_cmdtable.c | 3 ++- 5 files changed, 66 insertions(+), 11 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 4279c7c..aedcaea 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -689,7 +689,7 @@ after B, go to B section for information. Lists VCPU information for a specific domain. If no domain is specified, VCPU information for all domains will be provided. -=item B I I I I +=item B [I<-f|--force>] I I I I Set hard and soft affinity for a I of . Normally VCPUs can float between available CPUs whenever Xen deems a different run state @@ -716,6 +716,11 @@ leaving its hard affinity untouched. On the othe hand: will set both hard and soft affinity, the former to pCPUs 3 and 4, the latter to pCPUs 6,7,8, and 9. +Specifying I<-f> or I<--force> will remove a temporary pinning done by the +operating system (normally this should be done by the operating system). +In case a temporary pinning is active for a vcpu the affinity of this vcpu +can't be changed without this option. + =item B Prints information about guests. This list excludes information about diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4cdc169..53f0100 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5301,18 +5301,20 @@ err: return NULL; } -int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, - const libxl_bitmap *cpumap_hard, - const libxl_bitmap *cpumap_soft) +static int libxl__set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, + uint32_t vcpuid, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft, + unsigned flags) { GC_INIT(ctx); libxl_bitmap hard, soft; - int rc, flags = 0; + int rc; libxl_bitmap_init(&hard); libxl_bitmap_init(&soft); - if (!cpumap_hard && !cpumap_soft) { + if (!cpumap_hard && !cpumap_soft && !flags) { rc = ERROR_INVAL; goto out; } @@ -5327,7 +5329,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, goto out; libxl__bitmap_copy_best_effort(gc, &hard, cpumap_hard); - flags = XEN_VCPUAFFINITY_HARD; + flags |= XEN_VCPUAFFINITY_HARD; } if (cpumap_soft) { rc = libxl_cpu_bitmap_alloc(ctx, &soft, 0); @@ -5378,6 +5380,23 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, return rc; } +int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) +{ + return libxl__set_vcpuaffinity(ctx, domid, vcpuid, cpumap_hard, + cpumap_soft, 0); +} + +int libxl_set_vcpuaffinity_force(libxl_ctx *ctx, uint32_t domid, + uint32_t vcpuid, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft) +{ + return libxl__set_vcpuaffinity(ctx, domid, vcpuid, cpumap_hard, + cpumap_soft, XEN_VCPUAFFINITY_FORCE); +} + int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, unsigned int max_vcpus, const libxl_bitmap *cpumap_hard, diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index f9e3ef5..d587e0c 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -148,6 +148,12 @@ #define LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY 1 /* + * LIBXL_HAVE_SET_VCPUAFFINITY_FORCE indicates that the + * libxl_set_vcpuaffinity_force() library call is available. + */ +#define LIBXL_HAVE_SET_VCPUAFFINITY_FORCE 1 + +/* * LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE indicates that a * 'direct_io_safe' field (of boolean type) is present in * libxl_device_disk. @@ -1715,6 +1721,10 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, const libxl_bitmap *cpumap_hard, const libxl_bitmap *cpumap_soft); +int libxl_set_vcpuaffinity_force(libxl_ctx *ctx, uint32_t domid, + uint32_t vcpuid, + const libxl_bitmap *cpumap_hard, + const libxl_bitmap *cpumap_soft); int libxl_set_vcpuaffinity_all(libxl_ctx *ctx, uint32_t domid, unsigned int max_vcpus, const libxl_bitmap *cpumap_hard, diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 411473d..51fa487 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5344,6 +5344,10 @@ int main_vcpulist(int argc, char **argv) int main_vcpupin(int argc, char **argv) { + static struct option opts[] = { + {"force", 0, 0, 'f'}, + COMMON_LONG_OPTS + }; libxl_vcpuinfo *vcpuinfo; libxl_bitmap cpumap_hard, cpumap_soft;; libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; @@ -5356,12 +5360,17 @@ int main_vcpupin(int argc, char **argv) const char *vcpu, *hard_str, *soft_str; char *endptr; int opt, nb_cpu, nb_vcpu, rc = EXIT_FAILURE; + bool force = false; libxl_bitmap_init(&cpumap_hard); libxl_bitmap_init(&cpumap_soft); - SWITCH_FOREACH_OPT(opt, "", NULL, "vcpu-pin", 3) { - /* No options */ + SWITCH_FOREACH_OPT(opt, "f", opts, "vcpu-pin", 3) { + case 'f': + force = true; + break; + default: + break; } domid = find_domain(argv[optind]); @@ -5376,6 +5385,10 @@ int main_vcpupin(int argc, char **argv) fprintf(stderr, "Error: Invalid argument %s as VCPU.\n", vcpu); goto out; } + if (force) { + fprintf(stderr, "Error: --force and 'all' as VCPU not allowed.\n"); + goto out; + } vcpuid = -1; } @@ -5437,7 +5450,14 @@ int main_vcpupin(int argc, char **argv) goto out; } - if (vcpuid != -1) { + if (force) { + if (libxl_set_vcpuaffinity_force(ctx, domid, vcpuid, hard, soft)) { + fprintf(stderr, "Could not set affinity for vcpu `%ld'.\n", + vcpuid); + goto out; + } + } + else if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { fprintf(stderr, "Could not set affinity for vcpu `%ld'.\n", vcpuid); diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index fdc1ac6..7cc0401 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -222,7 +222,8 @@ struct cmd_spec cmd_table[] = { { "vcpu-pin", &main_vcpupin, 1, 1, "Set which CPUs a VCPU can use", - " ", + "[option] ", + "-f, --force undo an override pinning done by the kernel", }, { "vcpu-set", &main_vcpuset, 0, 1,