From patchwork Mon Jan 18 04:24:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8052161 Return-Path: X-Original-To: patchwork-qemu-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 A57199F440 for ; Mon, 18 Jan 2016 04:24:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1DC320222 for ; Mon, 18 Jan 2016 04:24:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D5C320221 for ; Mon, 18 Jan 2016 04:24:12 +0000 (UTC) Received: from localhost ([::1]:57359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL1MR-0001Yx-Fn for patchwork-qemu-devel@patchwork.kernel.org; Sun, 17 Jan 2016 23:24:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL1MB-0001Td-6W for qemu-devel@nongnu.org; Sun, 17 Jan 2016 23:23:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aL1M8-0001Hk-Ov for qemu-devel@nongnu.org; Sun, 17 Jan 2016 23:23:55 -0500 Received: from ozlabs.org ([103.22.144.67]:36139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL1M8-0001HB-Dz; Sun, 17 Jan 2016 23:23:52 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id D90E8140662; Mon, 18 Jan 2016 15:23:49 +1100 (AEDT) From: David Gibson To: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, armbru@redhat.com Date: Mon, 18 Jan 2016 15:24:37 +1100 Message-Id: <1453091083-13931-4-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453091083-13931-1-git-send-email-david@gibson.dropbear.id.au> References: <1453091083-13931-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCHv3 3/9] pseries: Clean up hash page table allocation error handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The spapr_alloc_htab() and spapr_reset_htab() functions currently handle all errors with error_setg(&error_abort, ...). But really, the callers are really better placed to decide on the error handling. So, instead make the functions use the error propagation infrastructure. In the callers we change to &error_fatal instead of &error_abort, since this can be triggered by a bad configuration or kernel error rather than indicating a programming error in qemu. While we're at it improve the messages themselves a bit, and clean up the indentation a little. Signed-off-by: David Gibson --- hw/ppc/spapr.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b7fd09a..d28e349 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1016,7 +1016,7 @@ static void emulate_spapr_hypercall(PowerPCCPU *cpu) #define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~HPTE64_V_HPTE_DIRTY)) #define DIRTY_HPTE(_hpte) ((*(uint64_t *)(_hpte)) |= tswap64(HPTE64_V_HPTE_DIRTY)) -static void spapr_alloc_htab(sPAPRMachineState *spapr) +static void spapr_alloc_htab(sPAPRMachineState *spapr, Error **errp) { long shift; int index; @@ -1031,7 +1031,8 @@ static void spapr_alloc_htab(sPAPRMachineState *spapr) * For HV KVM, host kernel will return -ENOMEM when requested * HTAB size can't be allocated. */ - error_setg(&error_abort, "Failed to allocate HTAB of requested size, try with smaller maxmem"); + error_setg_errno(errp, -shift, + "Error allocating KVM hash page table, try smaller maxmem"); } else if (shift > 0) { /* * Kernel handles htab, we don't need to allocate one @@ -1040,7 +1041,10 @@ static void spapr_alloc_htab(sPAPRMachineState *spapr) * but we don't allow booting of such guests. */ if (shift != spapr->htab_shift) { - error_setg(&error_abort, "Failed to allocate HTAB of requested size, try with smaller maxmem"); + error_setg(errp, + "Small allocation for KVM hash page table (%ld < %" + PRIu32 "), try smaller maxmem", + shift, spapr->htab_shift); } spapr->htab_shift = shift; @@ -1064,17 +1068,21 @@ static void spapr_alloc_htab(sPAPRMachineState *spapr) * If host kernel has allocated HTAB, KVM_PPC_ALLOCATE_HTAB ioctl is * used to clear HTAB. Otherwise QEMU-allocated HTAB is cleared manually. */ -static void spapr_reset_htab(sPAPRMachineState *spapr) +static void spapr_reset_htab(sPAPRMachineState *spapr, Error **errp) { long shift; int index; shift = kvmppc_reset_htab(spapr->htab_shift); if (shift < 0) { - error_setg(&error_abort, "Failed to reset HTAB"); + error_setg_errno(errp, -shift, + "Error resetting KVM hash page table, try smaller maxmem"); } else if (shift > 0) { if (shift != spapr->htab_shift) { - error_setg(&error_abort, "Requested HTAB allocation failed during reset"); + error_setg(errp, + "Reduced size on reset of KVM hash page table (%ld < %" + PRIu32 "), try smaller maxmem", + shift, spapr->htab_shift); } /* Tell readers to update their file descriptor */ @@ -1145,7 +1153,7 @@ static void ppc_spapr_reset(void) foreach_dynamic_sysbus_device(find_unknown_sysbus_device, NULL); /* Reset the hash table & recalc the RMA */ - spapr_reset_htab(spapr); + spapr_reset_htab(spapr, &error_fatal); qemu_devices_reset(); @@ -1792,7 +1800,7 @@ static void ppc_spapr_init(MachineState *machine) } spapr->htab_shift++; } - spapr_alloc_htab(spapr); + spapr_alloc_htab(spapr, &error_fatal); /* Set up Interrupt Controller before we create the VCPUs */ spapr->icp = xics_system_init(machine,