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 486E145610 for ; Fri, 12 Jul 2024 12:46:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 424C2402E5; Fri, 12 Jul 2024 12:46:13 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2081.outbound.protection.outlook.com [40.107.93.81]) by mails.dpdk.org (Postfix) with ESMTP id B046040261 for ; Fri, 12 Jul 2024 12:46:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cwb7qzhvEQggUIElHwJ33FhhAxf+Gu2lyDAPwNOAh0b7b0pJ5/Ku09giXqM87qjhlpQKUUiJ31jKQqiywj0smyqwtNlH4TEJ9p8DCRU2PnJ/N+wQRwtI0LWrLUdGH/k0dfIcm8mkX5ULpoxMYjti+lmBEN91zl2Tf9EFcVPPO5DGeYMKxUMslbRDArhRzCjPEI6zuxoccTIIz8R5fRgiWRxivqvTAlsIlAE79E2q+xbp1LXQYdsb7P4sic+IcNUJvfNiJBbe1Lb9z5gHImzcPpuGzyDxj5mjWaqtkhlHJl7NknMI+socV0FVTONOn2PCcxnNad+9xSX4gOMlOdam6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=3xTl1sU4/hNtd993YiKbfCjzO8TkVqpY2qjk3lWJsqw=; b=n9X0IsDOgbSfpsYi2k/DRIxpCIvnXcMIAsEcfUiCSwewg1sDIvRxLWaltH8W7GVqwbRxgTKoz6EQy+73sBK5T7AjIfUDMhW8yGFQZmnGKfbSVNn1DxpBJvFF4JXGDQGs9YNPFl8j5aoMDH10dXkeR88+8T9z3/zS+trcBgh7nrwWTyrn4HnbgzxK/LlE+lcub7MsFARgk2xmQ3jtPOsDOrwcl86KKQ0aB2XcbjrOzREx2knZ2+tEQrJ7ueW2/q2lZggFoqVcmrfZGNBFbOYKrIBn+h9D3E1bPMLN3A1e151dKq1Dh9W2RRAn6fNvUjcsUscIiM5vFf3HKR5wfXo+9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.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 (0) 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=3xTl1sU4/hNtd993YiKbfCjzO8TkVqpY2qjk3lWJsqw=; b=P5h37+LOy5NdipOPkogLzTU1DtbJq4dBba8S1A9CKJBcjWXB5iKHZQPlBw2j0yBkf7ur+Wo4Wg8UwIqfmQ4nhfgfp1YMdPSmOQ1BZkJH86xIv94PXMx0rhSk6sewo+i4gkd4rAkh+3d9mvn8l39Vse9MKxlVYQZnucBqkVBAExO7kMjrlF402QL5G/Q7Fi1zjgPevvmZ45aaA+JfaJQJfmsuFfw7LE+LLxJVFK1N2EEDdBsQfrct6oU8zTJ9joR25KhaP4WfwUpcsyLVPQe5DDqPkb3nXdhSMC+BBKeatCVBWRlwoS4DtPocigS4NGczzysS9V2a4vRw9clYOVOIaw== Received: from CH0P221CA0024.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::20) by BL3PR12MB6569.namprd12.prod.outlook.com (2603:10b6:208:38c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:46:09 +0000 Received: from CH1PEPF0000A348.namprd04.prod.outlook.com (2603:10b6:610:11c:cafe::97) by CH0P221CA0024.outlook.office365.com (2603:10b6:610:11c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:46:09 +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 CH1PEPF0000A348.mail.protection.outlook.com (10.167.244.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:46:09 +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.1544.4; Fri, 12 Jul 2024 03:45:51 -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.1544.4; Fri, 12 Jul 2024 03:45:49 -0700 From: Xueming Li To: David Marchand CC: Bruce Richardson , dpdk stable Subject: patch 'eal/unix: support ZSTD compression for firmware' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:49 +0800 Message-ID: <20240712104528.308638-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A348:EE_|BL3PR12MB6569:EE_ X-MS-Office365-Filtering-Correlation-Id: e8a0df02-b444-4e92-8538-08dca25fd717 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IRPfmhkb2/jzZjZtWv8FaG0obEj9fpg2MjK0nh/wQ0HwwxuElcP0uJRb5Jro?= =?us-ascii?Q?AaumKiXzHCynCbhxQswEv2TjcGkebCbsE11TGKDrdz5PZnzQFiZBGiEors/H?= =?us-ascii?Q?1pq53belwRiffZLY9wbYovvbYd2/+xvdzRtFTNI5Kf4uiV2LiCS4083gLvA1?= =?us-ascii?Q?XaWN9h2KbdPgXOX7XTVPH33jE58KSSR8p1R29c+IgOie7KMr1qvbn+n9W5Gs?= =?us-ascii?Q?DQofLRS3mzL7gWEQhESLNaVmuzL+SL5XROWrY5Mec3x8KI+EIPOr7X35cJj2?= =?us-ascii?Q?mkvbKO1HMM88kw6zujO6sjbV975rYRIZis7m5rDl6Yt7VVz0+RNGvoYCtcs7?= =?us-ascii?Q?Y4E+Woj6bjTQsRTTCHaQEXxV54bxA7Cad/Htor9AVe4oB3W27EFpcz9eCjWm?= =?us-ascii?Q?NGl3H1Ovu2ohUeBdItjxtvv49a0tXXjZaVh10NTIq/gE49F3/SgJF7F2QC1O?= =?us-ascii?Q?K0jzpgC1HZ0bi0XdK/tvuDClzD0yRaV848dIPcuvuWZTN4Y+4VJUTTRuYwp+?= =?us-ascii?Q?jiVPEoAHm9JFtZ2l9UnIaBBR0PDfjemEPzS95x4BnMaXJ/m5KMCt8moFWOLk?= =?us-ascii?Q?8D194zF8gOcibxkyibQ42fZfP3zgXQpKhpb2FjrQwLnA2mU8o4oUlhPMVpKh?= =?us-ascii?Q?LVpfzXL0ODQMZ02j8lmJmkQgQQmJ2kYbfQQBFqSSLSTP+c/04x4166JuFAbk?= =?us-ascii?Q?Td0M/WG2Eip0Fck0tG6DG54vnuEiVMJMR4IYdLKt/TRsWHIGm4BQ5tjq4MMK?= =?us-ascii?Q?74GFn6PsiQBw55aiJiyUiBAooxWHXQ0QBSZT4uAhIlu7n4NXWiyyWeWDKqro?= =?us-ascii?Q?KTmNBLTul0a6fcGmKL2VHAwbRFd6f9QYtDadoBYCcMa55Fdabf9KqOkEDsmm?= =?us-ascii?Q?mL2JkQin5BKRClBs3AfUXyFoxXm95295wpxI1O3gP72SDDncgwWFp/QsGZoC?= =?us-ascii?Q?VBCEYFh9Qabwe96S0QN3lQxt/oTXzAVKl9PCV00JXNADUewXC+kXJlm8sGYI?= =?us-ascii?Q?cDj7dsB+95hfV0Mdo4yrhCMKjSSHaOlvHhp2mA9ivC9OlEBUuLkSuBkKoIPt?= =?us-ascii?Q?6++iaQlUUuqDWPRjBl8tus9m/BFtuQaB27AJwsNAcrpzCxVk1ilnBCTiW63X?= =?us-ascii?Q?BWHclJ6mdFvkbSfKz5U/qPasj3S66Dtf7vDD+YmVkIrF8ZtcsIAcDFkb+Wgr?= =?us-ascii?Q?9HSMzUw5kRA1wO3EzdA/fcoROophlzxSPCTJTbejtfHPzvHAu2tnA3QCwogD?= =?us-ascii?Q?RdKSJL7O9/avI/nQqwPIxuI38kwHNVYTZZen6gY3DtiTjUWVDVsEj3ehbxNp?= =?us-ascii?Q?lkvsoupZ59U7vQ5SSUVnP1o6P2CNLqLV3wbMNDZXdSDIKSvm6GaAJStB6pge?= =?us-ascii?Q?gEtPZL/yenN3LsoL5OPHvZ+kQDKvWoDLEJ9+huYT4vQYteaydbXBH0w9FoUd?= =?us-ascii?Q?i8yXtpmp671F/p7EIeDVrL2Sq/IAbFRb?= 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:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:09.2128 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8a0df02-b444-4e92-8538-08dca25fd717 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: CH1PEPF0000A348.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6569 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d39af49b58a2c17edefa486ee906daf41986ab2b Thanks. Xueming Li --- >From d39af49b58a2c17edefa486ee906daf41986ab2b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 7 May 2024 13:01:53 +0200 Subject: [PATCH] eal/unix: support ZSTD compression for firmware Cc: Xueming Li [ upstream commit 6f80df8cb0f889203d7cd27766abcc6ebc720e33 ] Ubuntu 24.04 started to compress firmware files with ZSTD compression. Bugzilla ID: 1437 Signed-off-by: David Marchand Acked-by: Bruce Richardson --- lib/eal/unix/eal_firmware.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c index 1a7cf8e7b7..33e989188e 100644 --- a/lib/eal/unix/eal_firmware.c +++ b/lib/eal/unix/eal_firmware.c @@ -15,6 +15,8 @@ #include "eal_firmware.h" +static const char * const compression_suffixes[] = { "xz", "zst" }; + #ifdef RTE_HAS_LIBARCHIVE struct firmware_read_ctx { @@ -36,7 +38,11 @@ firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize) err = archive_read_support_filter_xz(ctx->a); if (err != ARCHIVE_OK && err != ARCHIVE_WARN) - goto error; + RTE_LOG(DEBUG, EAL, "could not initialise libarchive for xz compression"); + + err = archive_read_support_filter_zstd(ctx->a); + if (err != ARCHIVE_OK && err != ARCHIVE_WARN) + RTE_LOG(DEBUG, EAL, "could not initialise libarchive for zstd compression"); if (archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK) goto error; @@ -147,16 +153,21 @@ rte_firmware_read(const char *name, void **buf, size_t *bufsz) ret = firmware_read(name, buf, bufsz); if (ret < 0) { - snprintf(path, sizeof(path), "%s.xz", name); - path[PATH_MAX - 1] = '\0'; + unsigned int i; + + for (i = 0; i < RTE_DIM(compression_suffixes); i++) { + snprintf(path, sizeof(path), "%s.%s", name, compression_suffixes[i]); + path[PATH_MAX - 1] = '\0'; + if (access(path, F_OK) != 0) + continue; #ifndef RTE_HAS_LIBARCHIVE - if (access(path, F_OK) == 0) { RTE_LOG(WARNING, EAL, "libarchive not linked, %s cannot be decompressed\n", path); - } #else - ret = firmware_read(path, buf, bufsz); + ret = firmware_read(path, buf, bufsz); #endif + break; + } } return ret; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.543349175 +0800 +++ 0003-eal-unix-support-ZSTD-compression-for-firmware.patch 2024-07-12 18:40:13.906594251 +0800 @@ -1 +1 @@ -From 6f80df8cb0f889203d7cd27766abcc6ebc720e33 Mon Sep 17 00:00:00 2001 +From d39af49b58a2c17edefa486ee906daf41986ab2b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6f80df8cb0f889203d7cd27766abcc6ebc720e33 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 1d47e879c8..0d69b1e3f0 100644 +index 1a7cf8e7b7..33e989188e 100644 @@ -21 +23,2 @@ -@@ -16,6 +16,8 @@ +@@ -15,6 +15,8 @@ + @@ -23 +25,0 @@ - #include "eal_private.h" @@ -30 +32 @@ -@@ -37,7 +39,11 @@ firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize) +@@ -36,7 +38,11 @@ firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize) @@ -35 +37 @@ -+ EAL_LOG(DEBUG, "could not initialise libarchive for xz compression"); ++ RTE_LOG(DEBUG, EAL, "could not initialise libarchive for xz compression"); @@ -39 +41 @@ -+ EAL_LOG(DEBUG, "could not initialise libarchive for zstd compression"); ++ RTE_LOG(DEBUG, EAL, "could not initialise libarchive for zstd compression"); @@ -43 +45 @@ -@@ -148,16 +154,21 @@ rte_firmware_read(const char *name, void **buf, size_t *bufsz) +@@ -147,16 +153,21 @@ rte_firmware_read(const char *name, void **buf, size_t *bufsz) @@ -58 +60 @@ - EAL_LOG(WARNING, "libarchive not linked, %s cannot be decompressed", + RTE_LOG(WARNING, EAL, "libarchive not linked, %s cannot be decompressed\n",