From patchwork Fri Dec 18 12:23:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 7882831 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3CC9EBEEED for ; Fri, 18 Dec 2015 12:26:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46CBF2043C for ; Fri, 18 Dec 2015 12:26:32 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDE2A2041D for ; Fri, 18 Dec 2015 12:26:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4z-0005YA-Td; Fri, 18 Dec 2015 12:24:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4z-0005UN-7t for xen-devel@lists.xen.org; Fri, 18 Dec 2015 12:24:13 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id D2/1D-18316-DEAF3765; Fri, 18 Dec 2015 12:24:13 +0000 X-Env-Sender: prvs=787e22e97=George.Dunlap@citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450441435!6080398!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3034 invoked from network); 18 Dec 2015 12:24:09 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Dec 2015 12:24:09 -0000 X-IronPort-AV: E=Sophos;i="5.20,446,1444694400"; d="scan'208";a="326245104" From: George Dunlap To: Date: Fri, 18 Dec 2015 12:23:42 +0000 Message-ID: <1450441425-10755-3-git-send-email-george.dunlap@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> References: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: George Dunlap , Ian Jackson , Wei Liu , George Dunlap , Ian Campbell Subject: [Xen-devel] [PATCH v4 2/5] libxl: Fix libxl_set_memory_target return value X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 libxl_set_memory_target seems to have the following return values: * 1 on failure, if the failure happens because of a xenstore error *or* invalid target * -1 if the setmaxmem hypercall * -errno if the set_pod_target hypercall target fails * 0 on success Make it consistently return ERROR_FAIL on failure, unless the parameters were invalid, in which case return ERROR_INVAL. In accordance with CODING_SYTLE: 1. Leave rc uninitialized, and set when an error is detected 2. Use 'r' for return values to functions whose return values are a different error space (like xc_domain_setmaxmem and xc_domain_set_pod_target), or where a failure means retry, rather than fail the whole function (libxl__fill_dom0_memory_info), to reduce the risk that Signed-off-by: George Dunlap --- v4: - Use 'r' instead of 'lrc' - Set 'rc' before jumping to error path, rather than initializing at the beginning - Move removal of xc_domain_getinfolist to another patch CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxl/libxl.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a36101d..d05e58e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4742,7 +4742,7 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int32_t target_memkb, int relative, int enforce) { GC_INIT(ctx); - int rc = 1, abort_transaction = 0; + int rc, abort_transaction = 0, r; uint64_t memorykb; uint32_t videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; @@ -4770,15 +4770,15 @@ retry_transaction: if (!target && !domid) { if (!xs_transaction_end(ctx->xsh, t, 1)) goto out_no_transaction; - rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, + r = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, ¤t_max_memkb); - if (rc < 0) - goto out_no_transaction; + if (r < 0) { rc = ERROR_FAIL; goto out_no_transaction; } goto retry_transaction; } else if (!target) { LOGE(ERROR, "cannot get target memory info from %s/memory/target", dompath); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } else { current_target_memkb = strtoul(target, &endptr, 10); @@ -4786,6 +4786,7 @@ retry_transaction: LOGE(ERROR, "invalid memory target %s from %s/memory/target\n", target, dompath); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } } @@ -4794,6 +4795,7 @@ retry_transaction: LOGE(ERROR, "cannot get memory info from %s/memory/static-max", dompath); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } memorykb = strtoul(memmax, &endptr, 10); @@ -4801,6 +4803,7 @@ retry_transaction: LOGE(ERROR, "invalid max memory %s from %s/memory/static-max\n", memmax, dompath); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } @@ -4820,6 +4823,7 @@ retry_transaction: "memory_dynamic_max must be less than or equal to" " memory_static_max\n"); abort_transaction = 1; + rc = ERROR_INVAL; goto out; } @@ -4827,33 +4831,36 @@ retry_transaction: LOG(ERROR, "new target %d for dom0 is below the minimum threshold", new_target_memkb); abort_transaction = 1; + rc = ERROR_INVAL; goto out; } if (enforce) { memorykb = new_target_memkb + videoram; - rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb + + r = xc_domain_setmaxmem(ctx->xch, domid, memorykb + LIBXL_MAXMEM_CONSTANT); - if (rc != 0) { + if (r != 0) { LOGE(ERROR, "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed ""rc=%d\n", domid, memorykb + LIBXL_MAXMEM_CONSTANT, - rc); + r); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } } - rc = xc_domain_set_pod_target(ctx->xch, domid, + r = xc_domain_set_pod_target(ctx->xch, domid, (new_target_memkb + LIBXL_MAXMEM_CONSTANT) / 4, NULL, NULL, NULL); - if (rc != 0) { + if (r != 0) { LOGE(ERROR, "xc_domain_set_pod_target domid=%d, memkb=%d ""failed rc=%d\n", domid, new_target_memkb / 4, - rc); + r); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } @@ -4867,6 +4874,8 @@ retry_transaction: "%"PRIu32, new_target_memkb / 1024); libxl_dominfo_dispose(&ptr); + rc = 0; + out: if (!xs_transaction_end(ctx->xsh, t, abort_transaction) && !abort_transaction)