From patchwork Tue Feb 14 08:46:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9571469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3B2160578 for ; Tue, 14 Feb 2017 08:49:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B55332836B for ; Tue, 14 Feb 2017 08:49:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA31D283B3; Tue, 14 Feb 2017 08:49:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 199BF2836B for ; Tue, 14 Feb 2017 08:49:27 +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 1cdYlR-0004Xs-RT; Tue, 14 Feb 2017 08:47:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdYlQ-0004Xg-J1 for xen-devel@lists.xenproject.org; Tue, 14 Feb 2017 08:47:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id E0/F1-01971-B04C2A85; Tue, 14 Feb 2017 08:47:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXitHSDvS73kUU RBk+mSVh83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlLZ81iLlinVXH5ZS9zA+MD+S5GTg4JAX+J jtv/2EFsNgEdiYtzd7J1MXJwiAioSNzea9DFyMXBLPCcSeL9hAZmkLgwUP38UxUg5SwCqhLPr 2xnBLF5BSwl/lxdwgQxUk9i15HfrCDlnAJWEn+u64GYQkAlm+cxQ1QLSpyc+YQFxGYW0JRo3f 6bHcKWl2jeOhusRkhAUaJ/3gO2CYx8s5C0zELSMgtJywJG5lWMGsWpRWWpRbpGBnpJRZnpGSW 5iZk5uoYGpnq5qcXFiempOYlJxXrJ+bmbGIFhVs/AwLiDsXG23yFGSQ4mJVHe2E0LI4T4kvJT KjMSizPii0pzUosPMWpwcAj0rVl9gVGKJS8/L1VJgvfCoUURQoJFqempFWmZOcBIgCmV4OBRE uG9B5LmLS5IzC3OTIdInWJUlBLnvQ6SEABJZJTmwbXBou8So6yUMC8jAwODEE9BalFuZgmq/C tGcQ5GJWHe+yBTeDLzSuCmvwJazAS0mDVuIcjikkSElFQD48ykXcZ2VSrxnPfmR71UXvyi7Ud aU3vH3QkLRHcl2d4QtUswnC9l5HjjM59lPFNs3YvSDTJ1p+cm8typ3Bm/p8s82acscdHUXtX0 g0+fvGXbwBTDYW662YV51fHo8H62nKPKf8ru35rUzr/whH/ngoxqxQ2Lp+xYUtbAfuL1V8Ubc 16mhS16q8RSnJFoqMVcVJwIAB7GEcC5AgAA X-Env-Sender: prvs=211416eb8=roger.pau@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1487062024!48490186!2 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: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34755 invoked from network); 14 Feb 2017 08:47:06 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 14 Feb 2017 08:47:06 -0000 X-IronPort-AV: E=Sophos;i="5.35,160,1484006400"; d="scan'208";a="415667014" From: Roger Pau Monne To: Date: Tue, 14 Feb 2017 08:46:57 +0000 Message-ID: <20170214084658.88137-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170214084658.88137-1-roger.pau@citrix.com> References: <20170214084658.88137-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v3 1/2] xen/grants: print grant number and handle in hex format 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Due to the large number of grants in use it seems more useful to print the grant references and handlers in hex format rather than decimal. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan Cc: Wei Liu --- Changes since v2: - Remove the () and the final dot of messages. - Fix printing the ref in the 'g' debug key, so that 3 chars are used for the ref itself. --- xen/common/grant_table.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index d3ea805..f780975 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -814,7 +814,7 @@ __gnttab_map_grant_ref( /* Bounds check on the grant ref */ if ( unlikely(op->ref >= nr_grant_entries(rgt))) - PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref (%d).\n", op->ref); + PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref %#x\n", op->ref); act = active_entry_acquire(rgt, op->ref); shah = shared_entry_header(rgt, op->ref); @@ -1087,7 +1087,7 @@ __gnttab_unmap_common( if ( unlikely(op->handle >= lgt->maptrack_limit) ) { - gdprintk(XENLOG_INFO, "Bad handle (%d).\n", op->handle); + gdprintk(XENLOG_INFO, "Bad handle %#x\n", op->handle); op->status = GNTST_bad_handle; return; } @@ -1099,7 +1099,7 @@ __gnttab_unmap_common( if ( unlikely(!read_atomic(&op->map->flags)) ) { grant_read_unlock(lgt); - gdprintk(XENLOG_INFO, "Zero flags for handle (%d).\n", op->handle); + gdprintk(XENLOG_INFO, "Zero flags for handle %#x\n", op->handle); op->status = GNTST_bad_handle; return; } @@ -1132,7 +1132,7 @@ __gnttab_unmap_common( op->flags = read_atomic(&op->map->flags); if ( unlikely(!op->flags) || unlikely(op->map->domid != dom) ) { - gdprintk(XENLOG_WARNING, "Unstable handle %u\n", op->handle); + gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); rc = GNTST_bad_handle; goto unmap_out; } @@ -1706,7 +1706,7 @@ gnttab_prepare_for_transfer( if ( unlikely(ref >= nr_grant_entries(rgt)) ) { gdprintk(XENLOG_INFO, - "Bad grant reference (%d) for transfer to domain(%d).\n", + "Bad grant reference %#x for transfer to d%d\n", ref, rd->domain_id); goto fail; } @@ -2672,7 +2672,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) break; default: gdprintk(XENLOG_INFO, - "bad flags %#x in grant %u when switching version\n", + "bad flags %#x in grant %#x when switching version\n", flags, i); /* fall through */ case GTF_invalid: @@ -2836,9 +2836,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) - PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a); + PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a %#x\n", ref_a); if ( unlikely(ref_b >= nr_grant_entries(d->grant_table))) - PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b (%d).\n", ref_b); + PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b %#x\n", ref_b); /* Swapping the same ref is a no-op. */ if ( ref_a == ref_b ) @@ -2846,11 +2846,11 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) act_a = active_entry_acquire(gt, ref_a); if ( act_a->pin ) - PIN_FAIL(out, GNTST_eagain, "ref a %ld busy\n", (long)ref_a); + PIN_FAIL(out, GNTST_eagain, "ref a %#x busy\n", ref_a); act_b = active_entry_acquire(gt, ref_b); if ( act_b->pin ) - PIN_FAIL(out, GNTST_eagain, "ref b %ld busy\n", (long)ref_b); + PIN_FAIL(out, GNTST_eagain, "ref b %#x busy\n", ref_b); if ( gt->gt_version == 1 ) { @@ -3284,9 +3284,8 @@ gnttab_release_mappings( ref = map->ref; - gdprintk(XENLOG_INFO, "Grant release (%hu) ref:(%hu) " - "flags:(%x) dom:(%hu)\n", - handle, ref, map->flags, map->domid); + gdprintk(XENLOG_INFO, "Grant release %#x ref %#x flags %#x dom %u\n", + handle, ref, map->flags, map->domid); rd = rcu_lock_domain_by_id(map->domid); if ( rd == NULL ) @@ -3530,8 +3529,8 @@ static void gnttab_usage_print(struct domain *rd) first = 0; } - /* [ddd] ddddd 0xXXXXXX 0xXXXXXXXX ddddd 0xXXXXXX 0xXX */ - printk("[%3d] %5d 0x%06lx 0x%08x %5d 0x%06"PRIx64" 0x%02x\n", + /* [0xXXX] ddddd 0xXXXXXX 0xXXXXXXXX ddddd 0xXXXXXX 0xXX */ + printk("[0x%03x] %5d 0x%06lx 0x%08x %5d 0x%06"PRIx64" 0x%02x\n", ref, act->domid, act->frame, act->pin, sha->domid, frame, status); active_entry_release(act);