patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Xueming Li <xuemingl@nvidia.com>
To: David Marchand <david.marchand@redhat.com>,
	"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: Re: [PATCH v2] eal/unix: support ZSTD compression for firmware
Date: Wed, 3 Jul 2024 07:12:05 +0000	[thread overview]
Message-ID: <DM4PR12MB5373AFFF61373DD92F766ED9A1DD2@DM4PR12MB5373.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20240513111204.3120460-1-david.marchand@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 3081 bytes --]

Hi David,

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,
Xueming

________________________________
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

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


[-- Attachment #2: Type: text/html, Size: 7374 bytes --]

  parent reply	other threads:[~2024-07-03  7:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20240508095214.2541115-1-david.marchand@redhat.com>
2024-05-13 11:12 ` David Marchand
2024-05-13 11:37   ` Bruce Richardson
2024-05-13 11:47     ` David Marchand
2024-05-17 17:01     ` David Marchand
2024-07-03  7:12   ` Xueming Li [this message]
2024-07-03  7:27     ` David Marchand
2024-07-03  9:03       ` Xueming Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DM4PR12MB5373AFFF61373DD92F766ED9A1DD2@DM4PR12MB5373.namprd12.prod.outlook.com \
    --to=xuemingl@nvidia.com \
    --cc=bruce.richardson@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=yux.jiang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).