erofs-utils: introduce z_erofs_parse_cfgs()
PATCH 1/2 erofs-utils: introduce z_erofs_parse_cfgs()
This userspace implementation will be mainly used for the upcoming Intel In-Memory Analytics Accelerator integration.
--- include/erofs/internal.h | 1 + lib/decompress.c | 41 ++++++++++++++++++++++++++++++++++++++++ lib/super.c | 7 +++---- 3 files changed, 45 insertions(+), 4 deletions(-)
include/erofs/internal.h +1 -0
@@ -410,6 +410,7 @@ int z_erofs_read_one_data(struct erofs_inode *inode, erofs_off_t skip, erofs_off_t length, bool trimmed);void *erofs_read_metadata (struct erofs_sb_info *sbi,erofs_nid_t nid,erofs_off_t *offset,int *lengthp); +int z_erofs_parse_cfgs (struct erofs_sb_info *sbi,struct erofs_super_block *dsb);static inline int erofs_get_occupied_size (const struct erofs_inode *inode,erofs_off_t *size)
lib/decompress.c +41 -0
44 lines not on this page · raw message
lib/super.c +3 -4
@@ -126,10 +126,9 @@ int erofs_read_superblock(struct erofs_sb_info *sbi)memcpy (&sbi->uuid, dsb->uuid,sizeof (dsb->uuid)); -if (erofs_sb_has_compr_cfgs (sbi)) - sbi->available_compr_algs =le16_to_cpu (dsb->u1.available_compr_algs); -else - sbi->lz4_max_distance =le16_to_cpu (dsb->u1.lz4_max_distance); + ret =z_erofs_parse_cfgs (sbi, dsb); +if (ret) +return ret; ret =erofs_init_devices (sbi, dsb);if (ret)
Signature · 1 line
2.39.3
PATCH 2/2 erofs-utils: support Intel Query Processing Library
This adds the preliminary Intel QPL [1] support to enable built-in In-Memory Analytics Accelerator [2] started from Sapphire Rapids.
It just leverages the synchronous APIs for the sake of simplicity for now, thus performance for small compressed clusters can still be improved in the future if needed anyway.
[ QPL 1.5.0+ is strictly needed for pkg-config detection and
it can be explicitly enabled by --with-qpl. ]
Here are some performance numbers for reference:
Processors: Intel(R) Xeon(R) Platinum 8475B (192 cores) Memory: 512 GiB
Single-threaded decompression:
_____________________________________________________________
| | cluster size | image size | time (s) | | LZ4 | 65536 | 391581696 | 0.364 | | LZ4 | 1048576 | 373309440 | 0.376 | | Intel QPL (IAA) | 1048576 | 374816768 | 0.386 | | Intel QPL (IAA) | 65536 | 376057856 | 0.396 | | Intel QPL (IAA) | 4096 | 399650816 | 0.675 | | libdeflate (4k) | 1048576 | 374816768 | 1.862 | | libdeflate (4k) | 65536 | 376057856 | 1.859 | | libdeflate (4k) | 4096 | 399749120 | 2.203 | | libdeflate | 1048576 | 373563392 | 1.318 | | libdeflate | 65536 | 328712192 | 1.358 | | libdeflate | 4096 | 389943296 | 2.103 | | Zstd | N/A | 312548986 | 1.047 | | Zstd (fast) | N/A | 453096980 | 0.740 | |_________________|________________|______________|____________|
LZ4 1.9.4: [ mkfs.erofs -zlz4hc,12 -C65536 ]
[ mkfs.erofs -zlz4hc,12 -C1048576 ]
time fsck/fsck.erofs --extractQPL 1.5.0 (IAA) / libdeflate 1.20 (4k):
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C1048576 ]
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C65536 ]
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C4096 ]
time fsck/fsck.erofs --extractlibdeflate 1.20:
[ mkfs.erofs -zdeflate,level=9 -C1048576 ]
[ mkfs.erofs -zdeflate,level=9 -C65536 ]
[ mkfs.erofs -zdeflate,level=9 -C4096 ]
time fsck/fsck.erofs --extractZstd 1.5.6: [ zstd -k ] [ zstd -k --fast ]
time zstd -d -k -f -c --no-progress > /dev/null
[1] https://github.com/intel/qpl
[2] https://www.intel.com/content/www/us/en/products/docs/accelerator-engines/in-memory-analytics-accelerator.html
--- configure.ac | 37 +++++++++ dump/Makefile.am | 2 +- fsck/Makefile.am | 4 +- include/erofs/internal.h | 1 + lib/decompress.c | 167 ++++++++++++++++++++++++++++++++++++++- mkfs/Makefile.am | 2 +- 6 files changed, 208 insertions(+), 5 deletions(-)
configure.ac +37 -0
@@ -143,6 +143,11 @@ AC_ARG_WITH(libzstd, [AS_HELP_STRING([--with-libzstd], [Enable and build with of libzstd support @<:@default=auto@:>@])]) +AC_ARG_WITH(qpl, + [AS_HELP_STRING([--with-qpl], + [Enable and build with Intel QPL support @<:@default=disabled@:>@])], [], + [with_qpl="no"]) + AC_ARG_ENABLE(fuse, [AS_HELP_STRING([--enable-fuse], [enable erofsfuse @<:@default=no@:>@])], [enable_fuse="$enableval"], [enable_fuse="no"])
@@ -504,6 +509,31 @@ AS_IF([test "x$with_libzstd" != "xno"], [ ]) ]) +# Configure Intel QPL +have_qpl="no" +AS_IF([test "x$with_qpl" != "xno"], [ + PKG_CHECK_MODULES([libqpl], [qpl >= 1.5.0], [ + # Paranoia: don't trust the result reported by pkgconfig before trying out + saved_LIBS="$LIBS" + saved_CPPFLAGS=${CPPFLAGS} + CPPFLAGS="${libqpl_CFLAGS} ${CPPFLAGS}" + LIBS="${libqpl_LIBS} $LIBS" + AC_CHECK_HEADERS([qpl/qpl.h],[ + AC_CHECK_LIB(qpl, qpl_execute_job, [], [ + AC_MSG_ERROR([libqpl doesn't work properly])]) + AC_CHECK_DECL(qpl_execute_job, [have_qpl="yes"], + [AC_MSG_ERROR([libzstd doesn't work properly])], [[ +#include <qpl/qpl.h> + ]]) + ]) + LIBS="${saved_LIBS}" + CPPFLAGS="${saved_CPPFLAGS}"], [ + AS_IF([test "x$with_qpl" = "xyes"], [ + AC_MSG_ERROR([Cannot find proper libqpl]) + ]) + ]) +]) + # Enable 64-bit off_t CFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -525,6 +555,7 @@ AM_CONDITIONAL([ENABLE_FUSE], [test "x${have_fuse}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBLZMA], [test "x${have_liblzma}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBDEFLATE], [test "x${have_libdeflate}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBZSTD], [test "x${have_libzstd}" = "xyes"]) +AM_CONDITIONAL([ENABLE_QPL], [test "x${have_qpl}" = "xyes"]) if test "x$have_uuid" = "xyes"; then AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])
@@ -574,6 +605,12 @@ if test "x$have_libzstd" = "xyes"; then AC_DEFINE([HAVE_LIBZSTD], 1, [Define to 1 if libzstd is found]) fi +if test "x$have_qpl" = "xyes"; then + AC_DEFINE([HAVE_QPL], 1, [Define to 1 if qpl is found]) + AC_SUBST([libqpl_LIBS]) + AC_SUBST([libqpl_CFLAGS]) +fi + # Dump maximum block size AS_IF([test "x$erofs_cv_max_block_size" = "x"], [$erofs_cv_max_block_size = 4096], [])
dump/Makefile.am +1 -1
@@ -8,4 +8,4 @@ dump_erofs_SOURCES = main.c dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS}
fsck/Makefile.am +2 -2
@@ -8,7 +8,7 @@ fsck_erofs_SOURCES = main.c fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS} if ENABLE_FUZZING noinst_PROGRAMS = fuzz_erofsfsck
@@ -17,5 +17,5 @@ fuzz_erofsfsck_CFLAGS = -Wall -I$(top_srcdir)/include -DFUZZING fuzz_erofsfsck_LDFLAGS = -fsanitize=address,fuzzer fuzz_erofsfsck_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS} endif
include/erofs/internal.h +1 -0
@@ -131,6 +131,7 @@ struct erofs_sb_info {pthread_t dfops_worker;struct erofs_mkfs_dfops *mkfs_dfops;#endif +bool useqpl; };/* make sure that any user of the erofs headers has atleast 64bit off_t type */
lib/decompress.c +166 -1
185 lines not on this page · raw message
mkfs/Makefile.am +1 -1
@@ -7,4 +7,4 @@ mkfs_erofs_SOURCES = main.c mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} \ - ${libdeflate_LIBS} ${libzstd_LIBS} + ${libdeflate_LIBS} ${libzstd_LIBS} ${libqpl_LIBS}
Signature · 1 line
2.39.3
PATCH v2 2/2 erofs-utils: support Intel Query Processing Library
This adds the preliminary Intel QPL [1] support to enable built-in In-Memory Analytics Accelerator [2] started from Sapphire Rapids.
It just leverages the synchronous APIs for the sake of simplicity for now, thus performance for small compressed clusters can still be improved in the future if needed anyway.
[ QPL 1.5.0+ is strictly needed for pkg-config detection and
it can be explicitly enabled by --with-qpl. ]
Here are some performance numbers for reference:
Processors: Intel(R) Xeon(R) Platinum 8475B (192 cores) Memory: 512 GiB
Single-threaded decompression:
_____________________________________________________________
| | cluster size | image size | time (s) | | LZ4 | 65536 | 391581696 | 0.364 | | LZ4 | 1048576 | 373309440 | 0.376 | | Intel QPL (IAA) | 1048576 | 374816768 | 0.386 | | Intel QPL (IAA) | 65536 | 376057856 | 0.396 | | Intel QPL (IAA) | 4096 | 399650816 | 0.675 | | libdeflate (4k) | 1048576 | 374816768 | 1.862 | | libdeflate (4k) | 65536 | 376057856 | 1.859 | | libdeflate (4k) | 4096 | 399749120 | 2.203 | | libdeflate | 1048576 | 323457024 | 1.318 | | libdeflate | 65536 | 328712192 | 1.358 | | libdeflate | 4096 | 389943296 | 2.103 | | Zstd | N/A | 312548986 | 1.047 | | Zstd (fast) | N/A | 453096980 | 0.740 | |_________________|________________|______________|____________|
LZ4 1.9.4: [ mkfs.erofs -zlz4hc,12 -C65536 ]
[ mkfs.erofs -zlz4hc,12 -C1048576 ]
time fsck/fsck.erofs --extractQPL 1.5.0 (IAA) / libdeflate 1.20 (4k):
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C1048576 ]
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C65536 ]
[ mkfs.erofs -zdeflate,level=9,dictsize=4096 -C4096 ]
time fsck/fsck.erofs --extractlibdeflate 1.20:
[ mkfs.erofs -zdeflate,level=9 -C1048576 ]
[ mkfs.erofs -zdeflate,level=9 -C65536 ]
[ mkfs.erofs -zdeflate,level=9 -C4096 ]
time fsck/fsck.erofs --extractZstd 1.5.6: [ zstd -k ] [ zstd -k --fast ]
time zstd -d -k -f -c --no-progress > /dev/null
[1] https://github.com/intel/qpl
[2] https://www.intel.com/content/www/us/en/products/docs/accelerator-engines/in-memory-analytics-accelerator.html
---
changes since v1:
- Fix a wrong image size number in commit message;
- Minor configure.ac fix.
configure.ac | 37 +++++++++ dump/Makefile.am | 2 +- fsck/Makefile.am | 4 +- fuse/Makefile.am | 3 +- include/erofs/internal.h | 1 + lib/decompress.c | 167 ++++++++++++++++++++++++++++++++++++++- mkfs/Makefile.am | 2 +- 7 files changed, 210 insertions(+), 6 deletions(-)
configure.ac +37 -0
@@ -143,6 +143,11 @@ AC_ARG_WITH(libzstd, [AS_HELP_STRING([--with-libzstd], [Enable and build with of libzstd support @<:@default=auto@:>@])]) +AC_ARG_WITH(qpl, + [AS_HELP_STRING([--with-qpl], + [Enable and build with Intel QPL support @<:@default=disabled@:>@])], [], + [with_qpl="no"]) + AC_ARG_ENABLE(fuse, [AS_HELP_STRING([--enable-fuse], [enable erofsfuse @<:@default=no@:>@])], [enable_fuse="$enableval"], [enable_fuse="no"])
@@ -504,6 +509,31 @@ AS_IF([test "x$with_libzstd" != "xno"], [ ]) ]) +# Configure Intel QPL +have_qpl="no" +AS_IF([test "x$with_qpl" != "xno"], [ + PKG_CHECK_MODULES([libqpl], [qpl >= 1.5.0], [ + # Paranoia: don't trust the result reported by pkgconfig before trying out + saved_LIBS="$LIBS" + saved_CPPFLAGS=${CPPFLAGS} + CPPFLAGS="${libqpl_CFLAGS} ${CPPFLAGS}" + LIBS="${libqpl_LIBS} $LIBS" + AC_CHECK_HEADERS([qpl/qpl.h],[ + AC_CHECK_LIB(qpl, qpl_execute_job, [], [ + AC_MSG_ERROR([libqpl doesn't work properly])]) + AC_CHECK_DECL(qpl_execute_job, [have_qpl="yes"], + [AC_MSG_ERROR([libqpl doesn't work properly])], [[ +#include <qpl/qpl.h> + ]]) + ]) + LIBS="${saved_LIBS}" + CPPFLAGS="${saved_CPPFLAGS}"], [ + AS_IF([test "x$with_qpl" = "xyes"], [ + AC_MSG_ERROR([Cannot find proper libqpl]) + ]) + ]) +]) + # Enable 64-bit off_t CFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -525,6 +555,7 @@ AM_CONDITIONAL([ENABLE_FUSE], [test "x${have_fuse}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBLZMA], [test "x${have_liblzma}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBDEFLATE], [test "x${have_libdeflate}" = "xyes"]) AM_CONDITIONAL([ENABLE_LIBZSTD], [test "x${have_libzstd}" = "xyes"]) +AM_CONDITIONAL([ENABLE_QPL], [test "x${have_qpl}" = "xyes"]) if test "x$have_uuid" = "xyes"; then AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])
@@ -574,6 +605,12 @@ if test "x$have_libzstd" = "xyes"; then AC_DEFINE([HAVE_LIBZSTD], 1, [Define to 1 if libzstd is found]) fi +if test "x$have_qpl" = "xyes"; then + AC_DEFINE([HAVE_QPL], 1, [Define to 1 if qpl is found]) + AC_SUBST([libqpl_LIBS]) + AC_SUBST([libqpl_CFLAGS]) +fi + # Dump maximum block size AS_IF([test "x$erofs_cv_max_block_size" = "x"], [$erofs_cv_max_block_size = 4096], [])
dump/Makefile.am +1 -1
@@ -8,4 +8,4 @@ dump_erofs_SOURCES = main.c dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS}
fsck/Makefile.am +2 -2
@@ -8,7 +8,7 @@ fsck_erofs_SOURCES = main.c fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS} if ENABLE_FUZZING noinst_PROGRAMS = fuzz_erofsfsck
@@ -17,5 +17,5 @@ fuzz_erofsfsck_CFLAGS = -Wall -I$(top_srcdir)/include -DFUZZING fuzz_erofsfsck_LDFLAGS = -fsanitize=address,fuzzer fuzz_erofsfsck_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} \ - ${libzstd_LIBS} + ${libzstd_LIBS} ${libqpl_LIBS} endif
fuse/Makefile.am +2 -1
@@ -7,4 +7,5 @@ erofsfuse_SOURCES = main.c erofsfuse_CFLAGS = -Wall -I$(top_srcdir)/include erofsfuse_CFLAGS += ${libfuse2_CFLAGS} ${libfuse3_CFLAGS} ${libselinux_CFLAGS} erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse2_LIBS} ${libfuse3_LIBS} ${liblz4_LIBS} \ - ${libselinux_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} ${libzstd_LIBS} + ${libselinux_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS} ${libzstd_LIBS} \ + ${libqpl_LIBS}
include/erofs/internal.h +1 -0
@@ -131,6 +131,7 @@ struct erofs_sb_info {pthread_t dfops_worker;struct erofs_mkfs_dfops *mkfs_dfops;#endif +bool useqpl; };/* make sure that any user of the erofs headers has atleast 64bit off_t type */
lib/decompress.c +166 -1
185 lines not on this page · raw message
mkfs/Makefile.am +1 -1
@@ -7,4 +7,4 @@ mkfs_erofs_SOURCES = main.c mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ${zlib_LIBS} \ - ${libdeflate_LIBS} ${libzstd_LIBS} + ${libdeflate_LIBS} ${libzstd_LIBS} ${libqpl_LIBS}
Signature · 1 line
2.39.3