From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751301AbdEBR7i (ORCPT ); Tue, 2 May 2017 13:59:38 -0400 Received: from mail.kernel.org ([198.145.29.136]:52576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750827AbdEBR7h (ORCPT ); Tue, 2 May 2017 13:59:37 -0400 From: Andy Lutomirski To: xen-devel@lists.xenproject.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Andy Lutomirski , Juergen Gross , Konrad Rzeszutek Wilk , Boris Ostrovsky Subject: [PATCH] x86/xen: Improve failed hypercall debugging Date: Tue, 2 May 2017 10:59:22 -0700 Message-Id: <1eda2acc5ed68b41f24ba7ab2672976fd92a7f9e.1493747901.git.luto@kernel.org> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When fiddling with xen_exit_mmap(), I noticed that failed multicall debugging doesn't work if the multicall is just one call. Fix it. Cc: Juergen Gross Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Signed-off-by: Andy Lutomirski --- arch/x86/xen/multicalls.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c index ea54a08d8301..b6b3f024d342 100644 --- a/arch/x86/xen/multicalls.c +++ b/arch/x86/xen/multicalls.c @@ -96,23 +96,23 @@ void xen_mc_flush(void) for (i = 0; i < b->mcidx; i++) if (b->entries[i].result < 0) ret++; + } #if MC_DEBUG - if (ret) { - printk(KERN_ERR "%d multicall(s) failed: cpu %d\n", - ret, smp_processor_id()); - dump_stack(); - for (i = 0; i < b->mcidx; i++) { - printk(KERN_DEBUG " call %2d/%d: op=%lu arg=[%lx] result=%ld\t%pF\n", - i+1, b->mcidx, - b->debug[i].op, - b->debug[i].args[0], - b->entries[i].result, - b->caller[i]); - } + if (ret) { + printk(KERN_ERR "%d multicall(s) failed: cpu %d\n", + ret, smp_processor_id()); + dump_stack(); + for (i = 0; i < b->mcidx; i++) { + printk(KERN_DEBUG " call %2d/%d: op=%lu arg=[%lx] result=%ld\t%pF\n", + i+1, b->mcidx, + b->debug[i].op, + b->debug[i].args[0], + b->entries[i].result, + b->caller[i]); } -#endif } +#endif b->mcidx = 0; b->argidx = 0; -- 2.9.3