From patchwork Fri Sep 22 08:06:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 131820 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22A7A42616; Fri, 22 Sep 2023 10:06:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B28B440150; Fri, 22 Sep 2023 10:06:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 84BF44013F for ; Fri, 22 Sep 2023 10:06:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695369971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NRWW5aVhCX7IzjBB8JcwV4wGbyQ1AE4qvwAT6v6sJ8=; b=cLJWXUvpiRNSrAezPcIQ0Xl/9ewbJOoinbevXirYbkNU5x6T0+jASYHmrYfTC+SUoYzwk3 QeNhSE86hsfx0WwUx5Cr6Sn92wgUyF+qo2TWt5mH6NEg8m0LR9dfOTHHAeGdGsSRz7cneP 4U9lFO7JnKI+gNXxTNibsMtc+zbLoa0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-185-2EI9vzUPMWaOi6Y4whBMeA-1; Fri, 22 Sep 2023 04:06:10 -0400 X-MC-Unique: 2EI9vzUPMWaOi6Y4whBMeA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BBD8A38125AC; Fri, 22 Sep 2023 08:06:09 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CFE4711282; Fri, 22 Sep 2023 08:06:08 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: syalavarthi@marvell.com, jerinjacobk@gmail.com Subject: [PATCH] eal/unix: enhance error reporting for firmware Date: Fri, 22 Sep 2023 10:06:06 +0200 Message-ID: <20230922080606.905222-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Put more details if a libarchive context initialisation fails. Signed-off-by: David Marchand --- lib/eal/unix/eal_firmware.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c index d1616b0bd9..80aaadacf1 100644 --- a/lib/eal/unix/eal_firmware.c +++ b/lib/eal/unix/eal_firmware.c @@ -25,19 +25,42 @@ static int firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize) { struct archive_entry *e; + int err; ctx->a = archive_read_new(); if (ctx->a == NULL) return -1; - if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK || - archive_read_support_filter_xz(ctx->a) != ARCHIVE_OK || - archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK || - archive_read_next_header(ctx->a, &e) != ARCHIVE_OK) { - archive_read_free(ctx->a); - ctx->a = NULL; - return -1; + err = archive_read_support_format_raw(ctx->a); + if (err != ARCHIVE_OK) { + RTE_LOG(ERR, EAL, "archive_read_support_format_raw() failed with %d: %s\n", + err, archive_error_string(ctx->a)); + goto err; + } + err = archive_read_support_filter_xz(ctx->a); + if (err != ARCHIVE_OK) { + RTE_LOG(ERR, EAL, "archive_read_support_filter_xz() failed with %d: %s\n", + err, archive_error_string(ctx->a)); + goto err; + } + err = archive_read_open_filename(ctx->a, name, blocksize); + if (err != ARCHIVE_OK) { + RTE_LOG(ERR, EAL, "archive_read_open_filename() failed with %d: %s\n", + err, archive_error_string(ctx->a)); + goto err; + } + err = archive_read_next_header(ctx->a, &e); + if (err != ARCHIVE_OK) { + RTE_LOG(ERR, EAL, "archive_read_next_header() failed with %d: %s\n", + err, archive_error_string(ctx->a)); + goto err; } + return 0; + +err: + archive_read_free(ctx->a); + ctx->a = NULL; + return -1; } static ssize_t