<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Hi David,</div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> I get unix compilation failure when backporting this patch to 23.11 LTS, the EAL_LOG macro is not backported to 23.11 LTS, any suggestion? Regards,</div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Xueming</div> <div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <hr style="display: inline-block; width: 98%;"> <div id="divRplyFwdMsg" dir="ltr" style="color: inherit;">From: David Marchand <david.marchand@redhat.com> Sent: Monday, May 13, 2024 7:12 PM To: dev@dpdk.org <dev@dpdk.org> Cc: Yu Jiang <yux.jiang@intel.com>; Bruce Richardson <bruce.richardson@intel.com>; stable@dpdk.org <stable@dpdk.org> Subject: [PATCH v2] eal/unix: support ZSTD compression for firmware <div> </div> </div> <div class="elementToProof" style="font-size: 11pt;">Ubuntu 24.04 started to compress firmware files with ZSTD compression. Bugzilla ID: 1437 Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> --- Chances since v1: - fixed link issue when libarchive is not available, - Cc'd stable@dpdk.org, --- lib/eal/unix/eal_firmware.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c index 1d47e879c8..31de027598 100644 --- a/lib/eal/unix/eal_firmware.c +++ b/lib/eal/unix/eal_firmware.c @@ -16,6 +16,8 @@ #include "eal_firmware.h" #include "eal_private.h" +static const char * const compression_algorithms[] = { "xz", "zst" }; + #ifdef RTE_HAS_LIBARCHIVE struct firmware_read_ctx { @@ -37,7 +39,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; + EAL_LOG(DEBUG, "could not initialise libarchive for xz compression"); + + err = archive_read_support_filter_zstd(ctx->a); + if (err != ARCHIVE_OK && err != ARCHIVE_WARN) + EAL_LOG(DEBUG, "could not initialise libarchive for zstd compression"); if (archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK) goto error; @@ -148,16 +154,22 @@ 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_algorithms); i++) { + snprintf(path, sizeof(path), "%s.%s", name, + compression_algorithms[i]); + path[PATH_MAX - 1] = '\0'; + if (access(path, F_OK) != 0) + continue; #ifndef RTE_HAS_LIBARCHIVE - if (access(path, F_OK) == 0) { EAL_LOG(WARNING, "libarchive not linked, %s cannot be decompressed", path); - } #else - ret = firmware_read(path, buf, bufsz); + ret = firmware_read(path, buf, bufsz); #endif + break; + } } return ret; } -- 2.44.0 </div> </body> </html>