From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4591431D5 for ; Sun, 22 Oct 2023 16:23:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB6AF402C5; Sun, 22 Oct 2023 16:23:26 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2062.outbound.protection.outlook.com [40.107.93.62]) by mails.dpdk.org (Postfix) with ESMTP id B64074027E for ; Sun, 22 Oct 2023 16:23:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gh4VGsK0NEeFK6PAeyJE5BnKjGMI/2GM71HUbDKnOqBvj/G3PmI0bwaaxXhQGRgPC8bWDgrXvT2IburJn/DOtZzN/KxghDPbGizLwGUwGjvnt11m8F74lgEYJLS4A9n8Jkh10rWM9YO//MrqwYn1PNz3UJFLMKIMr9XeSXOZfFx4OjP0VP5WFzQDp3cs1bLmsspwVCH/6YSaJTLFTirB7A/6rO2F3x3oTuDDBmF408dVtVFyTHfc9adBc67+GlPELohWPlj2eq6+JL/PgIz3fdgISOfU1sbVhmtt0KRsg+ESDXM1cV4EMXb4HDoB4/Pi0vbpuuHa2hfgBMKkohZpCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=90caGuiABB79tJGMc77NYolFZ1Nbs8rKlolBE47+BkY=; b=ZRPh8QKM8d+pZxv+qGAwPfIGGadioHGQM3yaUv2dR1rkNG7rKkvdeP466FnqfCNHEqyGGtQSZ/KGDinixgOs1jWMLsEoOQ4/FL29omE5qsSmGbFhsyYRPUoPPWJs2NPpWrryR6xxhfe+zVv6Hc6zaY0EpEnHpDnlTRVsRomJVVl+oB+W38v54prw5zytnVvIa9y73Axe5oItEo/kEo9cKIs2cv81WUpwFz8M39ptOVoemeXpwMP87NyxLTaUw+NupxKwRdYXKCbi8O766Xa43678FHLe+D0VGln9NmaurmHyocJlciatykkjnu0MavkFy30r/jfy6dnOvlK8hrIgYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=90caGuiABB79tJGMc77NYolFZ1Nbs8rKlolBE47+BkY=; b=VXD4j1CcFfSJWkw2jLlZGs7AE600H2NGlcNRsBmPKZMbF6EG4urc/ZTzH5Lzjnk8X9jClDKuLbUU66BLnkqjsbOrSNiUfYqBmVyvpoHvgRs/YLUmCMNJLve0t0Ncu32uHtuJBtNwuu7l4KfF6iLu77aFrtEbHfdfoOa4ahPONYfFQWOuxauyFwhZknrfIOhS+qvT3+ZpThYKVEevsnWlJjQBYrP8OTP0BsftpqwxpNI8Cp7D1tSxDWkTD908JOvTlwC+R3/iGJB0wN8I7cNpAd+YHdCuKONFLwBhSnxFoo4PXwAlzxUzSIlvHb3zkW2jE4XAeCS4j1KP3bWRvXj2Nw== Received: from MW4PR04CA0136.namprd04.prod.outlook.com (2603:10b6:303:84::21) by DM6PR12MB4545.namprd12.prod.outlook.com (2603:10b6:5:2a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Sun, 22 Oct 2023 14:23:23 +0000 Received: from CO1PEPF000042A8.namprd03.prod.outlook.com (2603:10b6:303:84:cafe::1e) by MW4PR04CA0136.outlook.office365.com (2603:10b6:303:84::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.32 via Frontend Transport; Sun, 22 Oct 2023 14:23:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042A8.mail.protection.outlook.com (10.167.243.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:23:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:14 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:12 -0700 From: Xueming Li To: Srikanth Yalavarthi CC: David Marchand , dpdk stable Subject: patch 'eal/unix: fix firmware reading with external xz helper' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:32 +0800 Message-ID: <20231022142250.10324-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A8:EE_|DM6PR12MB4545:EE_ X-MS-Office365-Filtering-Correlation-Id: 10bc2d1c-a5a5-429a-7113-08dbd30a72e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6OpNWx72q1BvulEb/DJq7z9LfEgstixNm69T/BTzrsQ34y94F1wG8LMvBSIpG122adN6EPp+t0rxxq1NwRRqvPlgxLATL4LT1xJxuH8koGaMaKruyCXUPw1k4iQMb9/p62k97KgR9Cu6JqMepMXHWioPUpAFVkfmrctPxxLG4e1h3tXlL6np5ZSh5vTReb2wg1y12I4AjvgTYKef60LS4dA3eCWD0lIVzjXeqG/MlYWXKU6o3PcUVlJ4yOrb6e1+hGErafbaztnKoKCjrLIyo2QZafbWDhRZjZYC7p4+5tXXajw+YJ9RSusgBib87J31TMiGgdZbCKgACVhF7ZYJrpAB+IamoOzzG5ENmYzx2v9f/lM44F1GHj3TrokjVHcnefuM/ogeKB3CyMLUO5ZMB+5HcJ1JQ8aEVcQCTU1L48Z05oXeDcyoVbOZAdJhvrPhNU0TSL52OpqDX/xuBuDM4cZXtx1mwnIMYw/ERtJgwlCdMkNC+dEHniTUfnjVDsKcZB8t4FtGqKVfjUU1t3utANJuiTSYw2IEr7pA2VE2YCCxBcLrp7FAUx8FDlPFXURq22+wjYaGj3IkizUHssj13H1i1TNy242JvAcLIDSQYBFGKe94uvG+i9T71VuvpJt40PUDyks86JDS9cYSEQSM7PVe7mv9Q/B6r3wKnJ5p3M2z+4Hpl/ICSdcA3MEDpbQWreZyYFTrxiRE/0MLCRkRW6sEfs+5L+K+rxABILPEEcnhHHMaScVb6X45cidom7LcyW8UE93wiO78WOXlv+Nju3Sb3owDeQJ1iK8SS3SPrpI= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(136003)(346002)(376002)(39860400002)(230922051799003)(64100799003)(1800799009)(186009)(82310400011)(451199024)(46966006)(40470700004)(36840700001)(55016003)(2906002)(36860700001)(70206006)(316002)(6916009)(70586007)(54906003)(82740400003)(356005)(7636003)(2616005)(26005)(6286002)(16526019)(1076003)(478600001)(7696005)(6666004)(53546011)(966005)(40480700001)(47076005)(336012)(426003)(83380400001)(40460700003)(41300700001)(36756003)(5660300002)(86362001)(4326008)(8936002)(8676002)(4001150100001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:23:23.2071 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 10bc2d1c-a5a5-429a-7113-08dbd30a72e2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4545 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=f76fc5ef15ee257bf406cb29ecbb218061cc0f2f Thanks. Xueming Li --- >From f76fc5ef15ee257bf406cb29ecbb218061cc0f2f Mon Sep 17 00:00:00 2001 From: Srikanth Yalavarthi Date: Tue, 26 Sep 2023 07:44:54 -0700 Subject: [PATCH] eal/unix: fix firmware reading with external xz helper Cc: Xueming Li [ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ] libarchive may support xz decompression only through an external (slower) helper. In such a case, archive_read_support_filter_xz() returns ARCHIVE_WARN. Fixes: 40edb9c0d36b ("eal: handle compressed firmware") Signed-off-by: Srikanth Yalavarthi Reviewed-by: David Marchand --- lib/eal/unix/eal_firmware.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c index d1616b0bd9..1a7cf8e7b7 100644 --- a/lib/eal/unix/eal_firmware.c +++ b/lib/eal/unix/eal_firmware.c @@ -25,19 +25,31 @@ 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; - } + + if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK) + goto error; + + err = archive_read_support_filter_xz(ctx->a); + if (err != ARCHIVE_OK && err != ARCHIVE_WARN) + goto error; + + if (archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK) + goto error; + + if (archive_read_next_header(ctx->a, &e) != ARCHIVE_OK) + goto error; + return 0; + +error: + archive_read_free(ctx->a); + ctx->a = NULL; + return -1; } static ssize_t -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.589753700 +0800 +++ 0003-eal-unix-fix-firmware-reading-with-external-xz-helpe.patch 2023-10-22 22:17:34.126723700 +0800 @@ -1 +1 @@ -From 39970abcf4850e070aa4709c87bcac15cb27caf8 Mon Sep 17 00:00:00 2001 +From f76fc5ef15ee257bf406cb29ecbb218061cc0f2f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org