From patchwork Mon May 9 11:30:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 9045331 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 46C029F6FA for ; Mon, 9 May 2016 11:34:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 536762011E for ; Mon, 9 May 2016 11:34:47 +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 9BFB02008F for ; Mon, 9 May 2016 11:34:45 +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 1azjQT-0004yg-LV; Mon, 09 May 2016 11:32:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azjQS-0004xv-2v for xen-devel@lists.xenproject.org; Mon, 09 May 2016 11:32:36 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id E4/F3-07924-35570375; Mon, 09 May 2016 11:32:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsXiVRvkrBtUahB usO6OnsX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmvFp+TW2ggUaFY8uTWduYJwv08XIxSEkMJNR YtPhHWxdjJwcLAIvWSR6t6uCJCQE+lkljl/axw6SkBCIkXg7/yqUXSbx8PVlZhBbSEBL4tLKF SwQkyYxSdw6toQJJMEmYCYxc/JPFhBbREBJ4t6qyUwgRcwC2xklZp9sYQVJCAu4S2ycepwVYr WqROPWJrCpvALeEg8XTWSF2CYncfLYZCCbg4NTwEdi31MriMXeEjuW9bNPYBRYwMiwilG9OLW oLLVI10wvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT93EyMwsOoZGBh3MF5pcz7EKMnB pCTK68qoFy7El5SfUpmRWJwRX1Sak1p8iFGGg0NJgte5xCBcSLAoNT21Ii0zBxjiMGkJDh4lE d4QkDRvcUFibnFmOkTqFKMxx5YFN9YycWyZem8tkxBLXn5eqpQ4xCQBkNKM0jy4QbDYu8QoKy XMy8jAwCDEU5BalJtZgir/ilGcg1FJmNcRZApPZl4J3L5XQKcwAZ0ix6YPckpJIkJKqoGRP13 MbvKPz5FC7V4F0gEcx1c9lGg0Y0q6xL63fOcWDdly86AsrbkXQgvmhj8tv9ZQ2RXKkPugZ9Mj rwtvFnCtUzxn52j9c+L68ITfW2X2Plde9+v5n/2cybzltgkOa5es0O10v3jKKktwQ+OT7Aqt0 LhfRxac/pxT9PuC5PEPIotDbrW7syYpsRRnJBpqMRcVJwIA2dJ+C7gCAAA= X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1462793552!22452966!1 X-Originating-IP: [74.125.82.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45408 invoked from network); 9 May 2016 11:32:34 -0000 Received: from mail-wm0-f67.google.com (HELO mail-wm0-f67.google.com) (74.125.82.67) by server-12.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 May 2016 11:32:34 -0000 Received: by mail-wm0-f67.google.com with SMTP id e201so20165022wme.2 for ; Mon, 09 May 2016 04:32:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LoARwetpMyJwGcX7SeJ4W4WFoRpMKi82MCYOdba1qQ4=; b=PwiY5ea37bNOevR78M/YbDs5eZ33Rj+CqxJBmjzs8Jgm6Fp6OQvBLkSlE8Vnsn/kaq lwqc8G/H1alcLQv+8uj+RwVujuXuKp/hoQzfPgQ1kpL3DKZ/DPKki5fXiw/iqdtDA/ZM QbEcOC0YfwDnTXrb63QMx+8O1c5n0HCvmQ6na1WfA6WV6ni868pg1jcH75ZfEaNMtPt6 z3T8iubpjL7VqHE1YrYOSi/iL34vTy0dKsGuLfHYkUJMzk2R3PEzDm3seBDSoR4bt5ud PRqDb0/qKcfz2V+i0f/qU+SMob/woFGfkGxizGdahi8AG9lKoEwGjXz3szvPqlwmNpb3 rRcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LoARwetpMyJwGcX7SeJ4W4WFoRpMKi82MCYOdba1qQ4=; b=MbCDXkVQFkGk/JJ7hWbwTVTliYABPv8n1fD0Q6RKn6WI+kuHXZXQXZLLj2E1cjpJNi ZHOaO4H+lI34/QIT8ZVOocOeEv8zxTnSh3xOyfFzmqqO0TaBLu5NZEMCWUePjeY9nXEs HFM48gKVAwS3bJ7kKzBq7QEaP4vY1MtenP3/r1qjv0pa/yWPq57N5tsmYzbLu7SJ0vYv 5DkxPN89AEK9hhCcIBnc0HkBF2ptfYwJ83cqIrWcOJ2z9ayCyOyyBP6aG97p0+D8s3xE WIEi855WDXuq47U+BkvhCnQq6DPHcOtH0vccj3br3h9bqoRDZanPc5u+GmD2fiRHoTre 6viA== X-Gm-Message-State: AOPr4FVHdL8vFurWHYGpP4YdRWFWQJEhlL37yi8VGj+XjYfvBSWwZ+o3nZTVb/O58lcPWw== X-Received: by 10.28.87.6 with SMTP id l6mr11362379wmb.48.1462793551878; Mon, 09 May 2016 04:32:31 -0700 (PDT) Received: from paulina.fritz.box (p4FDE7A07.dip0.t-ipconnect.de. [79.222.122.7]) by smtp.gmail.com with ESMTPSA id y3sm30631459wji.40.2016.05.09.04.32.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 May 2016 04:32:30 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org Date: Mon, 9 May 2016 13:30:55 +0200 Message-Id: <1462793458-27170-5-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com> Cc: wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, Paulina Szubarczyk , dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v4 4/7] libxl: Fix libxl_set_memory_target return value 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 From: George Dunlap 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': on error, the setmaxmem and set_pod_target hypercalls return -1 and set errno appropriately. '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) 3. Use 'lrc' for return values to local functions libxl__* where a failure means retry, rather than fail the whole function (libxl__fill_dom0_memory_info), to reduce the risk of that. Signed-off-by: George Dunlap Signed-off-by: Paulina Szubarczyk Reviewed-by: Olaf Hering Acked-by: Wei Liu --- Changed since v3: - changed the changelog tools/libxl/libxl.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c39d745..7cb15bf 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4839,7 +4839,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, r, lrc, abort_transaction = 0; uint64_t memorykb; uint32_t videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; @@ -4867,15 +4867,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, + lrc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, ¤t_max_memkb); - if (rc < 0) - goto out_no_transaction; + if (lrc < 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); @@ -4883,6 +4883,7 @@ retry_transaction: LOGE(ERROR, "invalid memory target %s from %s/memory/target\n", target, dompath); abort_transaction = 1; + rc = ERROR_FAIL; goto out; } } @@ -4891,6 +4892,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); @@ -4898,6 +4900,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; } @@ -4917,6 +4920,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; } @@ -4924,33 +4928,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; } @@ -4964,6 +4971,7 @@ 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)