* [PATCH v10 1/2] erofs-utils: support calculating checksum of superblock
@ 2019-11-07 4:03 Gao Xiang
2019-11-07 4:03 ` [PATCH 2/2] erofs-utils: support 128-bit filesystem UUID Gao Xiang
0 siblings, 1 reply; 6+ messages in thread
From: Gao Xiang @ 2019-11-07 4:03 UTC (permalink / raw)
To: Li Guifu, Chao Yu; +Cc: Miao Xie, linux-erofs
From: Pratik Shinde <pratikshinde320@gmail.com>
Added code for calculating crc of superblock.
Note that the first 1024 bytes are not checksummed to allow
for the installation of x86 boot sectors and other oddities.
Fill 'feature_compat' field of erofs_super_block so that it
can be used on kernel side. also fixing one typo.
Signed-off-by: Pratik Shinde <pratikshinde320@gmail.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Cc: Li Guifu <bluce.liguifu@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
changes since v9:
- fix a typo found by checkpatch "checksumed" -> "checksummed";
- update commit message since it's now limited to superblock;
- update function name "erofs_superblock_csum_set" ->
"erofs_mkfs_superblock_csum_set".
(I'd like to apply this version finally if no more comments...)
include/erofs/internal.h | 1 +
include/erofs/io.h | 8 +++++
include/erofs_fs.h | 3 +-
lib/io.c | 27 ++++++++++++++++
mkfs/main.c | 69 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 107 insertions(+), 1 deletion(-)
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 25ce7b54442d..9e2bb9ce33b6 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -52,6 +52,7 @@ struct erofs_sb_info {
erofs_blk_t meta_blkaddr;
erofs_blk_t xattr_blkaddr;
+ u32 feature_compat;
u32 feature_incompat;
u64 build_time;
u32 build_time_nsec;
diff --git a/include/erofs/io.h b/include/erofs/io.h
index 97750478b5ab..e0ca8d949130 100644
--- a/include/erofs/io.h
+++ b/include/erofs/io.h
@@ -19,6 +19,7 @@
int dev_open(const char *devname);
void dev_close(void);
int dev_write(const void *buf, u64 offset, size_t len);
+int dev_read(void *buf, u64 offset, size_t len);
int dev_fillzero(u64 offset, size_t len, bool padding);
int dev_fsync(void);
int dev_resize(erofs_blk_t nblocks);
@@ -31,5 +32,12 @@ static inline int blk_write(const void *buf, erofs_blk_t blkaddr,
blknr_to_addr(nblocks));
}
+static inline int blk_read(void *buf, erofs_blk_t start,
+ u32 nblocks)
+{
+ return dev_read(buf, blknr_to_addr(start),
+ blknr_to_addr(nblocks));
+}
+
#endif
diff --git a/include/erofs_fs.h b/include/erofs_fs.h
index f29aa2516a99..bcc4f0c630ad 100644
--- a/include/erofs_fs.h
+++ b/include/erofs_fs.h
@@ -13,6 +13,8 @@
#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2
#define EROFS_SUPER_OFFSET 1024
+#define EROFS_FEATURE_COMPAT_SB_CHKSUM 0x00000001
+
/*
* Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should
* be incompatible with this kernel version.
@@ -39,7 +41,6 @@ struct erofs_super_block {
__u8 uuid[16]; /* 128-bit uuid for volume */
__u8 volume_name[16]; /* volume name */
__le32 feature_incompat;
-
__u8 reserved2[44];
};
diff --git a/lib/io.c b/lib/io.c
index 7f5f94dd6b1e..52f9424d201b 100644
--- a/lib/io.c
+++ b/lib/io.c
@@ -207,3 +207,30 @@ int dev_resize(unsigned int blocks)
return dev_fillzero(st.st_size, length, true);
}
+int dev_read(void *buf, u64 offset, size_t len)
+{
+ int ret;
+
+ if (cfg.c_dry_run)
+ return 0;
+
+ if (!buf) {
+ erofs_err("buf is NULL");
+ return -EINVAL;
+ }
+ if (offset >= erofs_devsz || len > erofs_devsz ||
+ offset > erofs_devsz - len) {
+ erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond"
+ "the end of device(%" PRIu64 ").",
+ offset, len, erofs_devsz);
+ return -EINVAL;
+ }
+
+ ret = pread64(erofs_devfd, buf, len, (off64_t)offset);
+ if (ret != (int)len) {
+ erofs_err("Failed to read data from device - %s:[%" PRIu64 ", %zd].",
+ erofs_devname, offset, len);
+ return -errno;
+ }
+ return 0;
+}
diff --git a/mkfs/main.c b/mkfs/main.c
index ab57896e9ca8..9187c43ed671 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -109,6 +109,12 @@ static int parse_extended_opts(const char *opts)
return -EINVAL;
cfg.c_force_inodeversion = FORCE_INODE_EXTENDED;
}
+
+ if (MATCH_EXTENTED_OPT("nosbcrc", token, keylen)) {
+ if (vallen)
+ return -EINVAL;
+ sbi.feature_compat &= ~EROFS_FEATURE_COMPAT_SB_CHKSUM;
+ }
}
return 0;
}
@@ -218,6 +224,8 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
.meta_blkaddr = sbi.meta_blkaddr,
.xattr_blkaddr = sbi.xattr_blkaddr,
.feature_incompat = cpu_to_le32(sbi.feature_incompat),
+ .feature_compat = cpu_to_le32(sbi.feature_compat &
+ ~EROFS_FEATURE_COMPAT_SB_CHKSUM),
};
const unsigned int sb_blksize =
round_up(EROFS_SUPER_END, EROFS_BLKSIZ);
@@ -240,6 +248,63 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
return 0;
}
+#define CRC32C_POLY_LE 0x82F63B78
+static inline u32 crc32c(u32 crc, const u8 *in, size_t len)
+{
+ int i;
+
+ while (len--) {
+ crc ^= *in++;
+ for (i = 0; i < 8; i++)
+ crc = (crc >> 1) ^ ((crc & 1) ? CRC32C_POLY_LE : 0);
+ }
+ return crc;
+}
+
+static int erofs_mkfs_superblock_csum_set(void)
+{
+ int ret;
+ u8 buf[EROFS_BLKSIZ];
+ u32 crc;
+ struct erofs_super_block *sb;
+
+ ret = blk_read(buf, 0, 1);
+ if (ret) {
+ erofs_err("failed to read superblock to set checksum: %s",
+ erofs_strerror(ret));
+ return ret;
+ }
+
+ /*
+ * skip the first 1024 bytes, to allow for the installation
+ * of x86 boot sectors and other oddities.
+ */
+ sb = (struct erofs_super_block *)(buf + EROFS_SUPER_OFFSET);
+
+ if (le32_to_cpu(sb->magic) != EROFS_SUPER_MAGIC_V1) {
+ erofs_err("internal error: not an erofs valid image");
+ return -EFAULT;
+ }
+
+ /* turn on checksum feature */
+ sb->feature_compat = cpu_to_le32(le32_to_cpu(sb->feature_compat) |
+ EROFS_FEATURE_COMPAT_SB_CHKSUM);
+ crc = crc32c(~0, (u8 *)sb, EROFS_BLKSIZ - EROFS_SUPER_OFFSET);
+
+ /* set up checksum field to erofs_super_block */
+ sb->checksum = cpu_to_le32(crc);
+
+ ret = blk_write(buf, 0, 1);
+ if (ret) {
+ erofs_err("failed to write checksummed superblock: %s",
+ erofs_strerror(ret));
+ return ret;
+ }
+
+ erofs_info("superblock checksum 0x%08x written", crc);
+ return 0;
+}
+
int main(int argc, char **argv)
{
int err = 0;
@@ -255,6 +320,7 @@ int main(int argc, char **argv)
cfg.c_legacy_compress = false;
sbi.feature_incompat = EROFS_FEATURE_INCOMPAT_LZ4_0PADDING;
+ sbi.feature_compat = EROFS_FEATURE_COMPAT_SB_CHKSUM;
err = mkfs_parse_options_cfg(argc, argv);
if (err) {
@@ -337,6 +403,9 @@ int main(int argc, char **argv)
err = -EIO;
else
err = dev_resize(nblocks);
+
+ if (!err && (sbi.feature_compat & EROFS_FEATURE_COMPAT_SB_CHKSUM))
+ err = erofs_mkfs_superblock_csum_set();
exit:
z_erofs_compress_exit();
dev_close();
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] erofs-utils: support 128-bit filesystem UUID
2019-11-07 4:03 [PATCH v10 1/2] erofs-utils: support calculating checksum of superblock Gao Xiang
@ 2019-11-07 4:03 ` Gao Xiang
2019-11-08 8:01 ` [PATCH v2] " Gao Xiang
0 siblings, 1 reply; 6+ messages in thread
From: Gao Xiang @ 2019-11-07 4:03 UTC (permalink / raw)
To: Li Guifu, Chao Yu; +Cc: Miao Xie, linux-erofs
Introduce filesystem UUID and a new feature_compat
flag to indicate uuid field is available.
Cc: Chao Yu <yuchao0@huawei.com>
Cc: Li Guifu <bluce.liguifu@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
configure.ac | 18 ++++++++++++++++++
include/erofs/internal.h | 1 +
include/erofs_fs.h | 1 +
mkfs/Makefile.am | 3 ++-
mkfs/main.c | 18 ++++++++++++++++++
5 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a93767f61578..c4d3af6a3a43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ AC_ARG_ENABLE(lz4,
[AS_HELP_STRING([--disable-lz4], [disable LZ4 compression support @<:@default=enabled@:>@])],
[enable_lz4="$enableval"], [enable_lz4="yes"])
+AC_ARG_WITH(uuid,
+ [AS_HELP_STRING([--without-uuid],
+ [Ignore presence of libuuid and disable uuid support @<:@default=enabled@:>@])])
+
# Checks for libraries.
# Use customized LZ4 library path when specified.
AC_ARG_WITH(lz4-incdir,
@@ -172,6 +176,20 @@ fi
AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"])
AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"])
+# Configure libuuid
+AS_IF([test "x$with_uuid" != "xno"],
+ [PKG_CHECK_MODULES([libuuid], [uuid],
+ [have_uuid=yes], [have_uuid=no])],
+ [have_uuid=no]
+)
+
+AS_IF([test "x$have_uuid" = "xyes"],
+ [AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])],
+ [AS_IF([test "x$with_uuid" = "xyes"],
+ [AC_MSG_ERROR([uuid support requested but libuuid not found])]
+ )]
+)
+
AC_CONFIG_FILES([Makefile
man/Makefile
lib/Makefile
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 9e2bb9ce33b6..e13adda12257 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -56,6 +56,7 @@ struct erofs_sb_info {
u32 feature_incompat;
u64 build_time;
u32 build_time_nsec;
+ u8 uuid[16];
};
/* global sbi */
diff --git a/include/erofs_fs.h b/include/erofs_fs.h
index bcc4f0c630ad..66844dc627f5 100644
--- a/include/erofs_fs.h
+++ b/include/erofs_fs.h
@@ -14,6 +14,7 @@
#define EROFS_SUPER_OFFSET 1024
#define EROFS_FEATURE_COMPAT_SB_CHKSUM 0x00000001
+#define EROFS_FEATURE_COMPAT_SB_UUID 0x00000002
/*
* Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 257f86422bae..9ce06d654d3d 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -3,7 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
+AM_CPPFLAGS = ${libuuid_CFLAGS}
mkfs_erofs_SOURCES = main.c
mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
-mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la
+mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libuuid_LIBS}
diff --git a/mkfs/main.c b/mkfs/main.c
index 9187c43ed671..e42b10f754b6 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -22,6 +22,10 @@
#include "erofs/compress.h"
#include "erofs/xattr.h"
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#endif
+
#define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
static struct option long_options[] = {
@@ -234,6 +238,7 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
*blocks = erofs_mapbh(NULL, true);
sb.blocks = cpu_to_le32(*blocks);
sb.root_nid = cpu_to_le16(root_nid);
+ memcpy(sb.uuid, sbi.uuid, sizeof(sb.uuid));
buf = calloc(sb_blksize, 1);
if (!buf) {
@@ -305,6 +310,18 @@ static int erofs_mkfs_superblock_csum_set(void)
return 0;
}
+static void erofs_mkfs_generate_uuid(void)
+{
+ char uuid_str[37] = "not available";
+
+#ifdef HAVE_LIBUUID
+ uuid_generate(sbi.uuid);
+ uuid_unparse_lower(sbi.uuid, uuid_str);
+ sbi.feature_compat |= EROFS_FEATURE_COMPAT_SB_UUID;
+#endif
+ erofs_info("filesystem UUID: %s", uuid_str);
+}
+
int main(int argc, char **argv)
{
int err = 0;
@@ -376,6 +393,7 @@ int main(int argc, char **argv)
goto exit;
}
+ erofs_mkfs_generate_uuid();
erofs_inode_manager_init();
err = erofs_build_shared_xattrs_from_path(cfg.c_src_path);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] erofs-utils: support 128-bit filesystem UUID
2019-11-07 4:03 ` [PATCH 2/2] erofs-utils: support 128-bit filesystem UUID Gao Xiang
@ 2019-11-08 8:01 ` Gao Xiang
2019-11-13 3:52 ` [PATCH v3] " Gao Xiang via Linux-erofs
0 siblings, 1 reply; 6+ messages in thread
From: Gao Xiang @ 2019-11-08 8:01 UTC (permalink / raw)
To: Li Guifu, Chao Yu; +Cc: Miao Xie, linux-erofs
Complete filesystem UUID feature on userspace side.
Cc: Chao Yu <yuchao0@huawei.com>
Cc: Li Guifu <bluce.liguifu@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
changes since v1:
- drop feature_compat since kernel side can already
parse UUID from erofs superblock.
configure.ac | 18 ++++++++++++++++++
include/erofs/internal.h | 1 +
mkfs/Makefile.am | 3 ++-
mkfs/main.c | 20 ++++++++++++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a93767f61578..c4d3af6a3a43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ AC_ARG_ENABLE(lz4,
[AS_HELP_STRING([--disable-lz4], [disable LZ4 compression support @<:@default=enabled@:>@])],
[enable_lz4="$enableval"], [enable_lz4="yes"])
+AC_ARG_WITH(uuid,
+ [AS_HELP_STRING([--without-uuid],
+ [Ignore presence of libuuid and disable uuid support @<:@default=enabled@:>@])])
+
# Checks for libraries.
# Use customized LZ4 library path when specified.
AC_ARG_WITH(lz4-incdir,
@@ -172,6 +176,20 @@ fi
AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"])
AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"])
+# Configure libuuid
+AS_IF([test "x$with_uuid" != "xno"],
+ [PKG_CHECK_MODULES([libuuid], [uuid],
+ [have_uuid=yes], [have_uuid=no])],
+ [have_uuid=no]
+)
+
+AS_IF([test "x$have_uuid" = "xyes"],
+ [AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])],
+ [AS_IF([test "x$with_uuid" = "xyes"],
+ [AC_MSG_ERROR([uuid support requested but libuuid not found])]
+ )]
+)
+
AC_CONFIG_FILES([Makefile
man/Makefile
lib/Makefile
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 9e2bb9ce33b6..e13adda12257 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -56,6 +56,7 @@ struct erofs_sb_info {
u32 feature_incompat;
u64 build_time;
u32 build_time_nsec;
+ u8 uuid[16];
};
/* global sbi */
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 257f86422bae..9ce06d654d3d 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -3,7 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
+AM_CPPFLAGS = ${libuuid_CFLAGS}
mkfs_erofs_SOURCES = main.c
mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
-mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la
+mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libuuid_LIBS}
diff --git a/mkfs/main.c b/mkfs/main.c
index 9187c43ed671..7493a481be82 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -22,6 +22,10 @@
#include "erofs/compress.h"
#include "erofs/xattr.h"
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#endif
+
#define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
static struct option long_options[] = {
@@ -234,6 +238,7 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
*blocks = erofs_mapbh(NULL, true);
sb.blocks = cpu_to_le32(*blocks);
sb.root_nid = cpu_to_le16(root_nid);
+ memcpy(sb.uuid, sbi.uuid, sizeof(sb.uuid));
buf = calloc(sb_blksize, 1);
if (!buf) {
@@ -305,6 +310,20 @@ static int erofs_mkfs_superblock_csum_set(void)
return 0;
}
+static void erofs_mkfs_generate_uuid(void)
+{
+ char uuid_str[37] = "not available";
+
+#ifdef HAVE_LIBUUID
+ do {
+ uuid_generate(sbi.uuid);
+ } while (uuid_is_null(sbi.uuid));
+
+ uuid_unparse_lower(sbi.uuid, uuid_str);
+#endif
+ erofs_info("filesystem UUID: %s", uuid_str);
+}
+
int main(int argc, char **argv)
{
int err = 0;
@@ -376,6 +395,7 @@ int main(int argc, char **argv)
goto exit;
}
+ erofs_mkfs_generate_uuid();
erofs_inode_manager_init();
err = erofs_build_shared_xattrs_from_path(cfg.c_src_path);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3] erofs-utils: support 128-bit filesystem UUID
2019-11-08 8:01 ` [PATCH v2] " Gao Xiang
@ 2019-11-13 3:52 ` Gao Xiang via Linux-erofs
2019-11-13 6:01 ` [PATCH v4] " Gao Xiang via Linux-erofs
0 siblings, 1 reply; 6+ messages in thread
From: Gao Xiang via Linux-erofs @ 2019-11-13 3:52 UTC (permalink / raw)
To: Li Guifu, Chao Yu, linux-erofs; +Cc: Miao Xie
Complete filesystem UUID feature on userspace side.
Cc: Chao Yu <yuchao0@huawei.com>
Cc: Li Guifu <bluce.liguifu@huawei.com>
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
---
changes since v2:
- fix multilib false positive reported by erofs-utils-ci #83
https://travis-ci.org/erofs/erofs-utils-ci/builds/609603134
- test presence of pkg-config in advance.
configure.ac | 33 +++++++++++++++++++++++++++++++++
include/erofs/internal.h | 1 +
mkfs/Makefile.am | 3 ++-
mkfs/main.c | 20 ++++++++++++++++++++
4 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a93767f..9238d3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ AC_PROG_INSTALL
LT_INIT
+# Test presence of pkg-config
+AC_MSG_CHECKING([pkg-config m4 macros])
+if test m4_ifdef([PKG_CHECK_MODULES], [yes], [no]) = "yes"; then
+ AC_MSG_RESULT([yes]);
+else
+ AC_MSG_RESULT([no]);
+ AC_MSG_ERROR([pkg-config is required. See pkg-config.freedesktop.org])
+fi
+
dnl EROFS_UTILS_PARSE_DIRECTORY
dnl Input: $1 = a string to a relative or absolute directory
dnl Output: $2 = the variable to set with the absolute directory
@@ -54,6 +63,10 @@ AC_ARG_ENABLE(lz4,
[AS_HELP_STRING([--disable-lz4], [disable LZ4 compression support @<:@default=enabled@:>@])],
[enable_lz4="$enableval"], [enable_lz4="yes"])
+AC_ARG_WITH(uuid,
+ [AS_HELP_STRING([--without-uuid],
+ [Ignore presence of libuuid and disable uuid support @<:@default=enabled@:>@])])
+
# Checks for libraries.
# Use customized LZ4 library path when specified.
AC_ARG_WITH(lz4-incdir,
@@ -123,6 +136,19 @@ AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE, 1,
# Checks for library functions.
AC_CHECK_FUNCS([fallocate gettimeofday memset realpath strdup strerror strrchr strtoull])
+# Configure libuuid
+AS_IF([test "x$with_uuid" != "xno"], [
+ PKG_CHECK_MODULES([libuuid], [uuid])
+ # Paranoia: don't trust the result reported by pkgconfig before trying out
+ saved_LIBS="$LIBS"
+ LIBS="${libuuid_LIBS} $LIBS"
+ AC_TRY_LINK([
+#include <uuid.h>
+], [
+return uuid_generate();
+], [have_uuid=yes], [have_uuid=no])
+ LIBS="${saved_LIBS}"], [have_uuid=no])
+
# Configure lz4
test -z $LZ4_LIBS && LZ4_LIBS='-llz4'
@@ -169,6 +195,13 @@ if test "x$enable_lz4" = "xyes"; then
CFLAGS=${saved_CPPFLAGS}
fi
+AS_IF([test "x$have_uuid" = "xyes"],
+ [AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])],
+ [AS_IF([test "x$with_uuid" = "xyes"],
+ [AC_MSG_ERROR([uuid support requested but libuuid not found])]
+ )]
+)
+
AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"])
AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"])
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 9e2bb9c..e13adda 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -56,6 +56,7 @@ struct erofs_sb_info {
u32 feature_incompat;
u64 build_time;
u32 build_time_nsec;
+ u8 uuid[16];
};
/* global sbi */
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 257f864..9ce06d6 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -3,7 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
+AM_CPPFLAGS = ${libuuid_CFLAGS}
mkfs_erofs_SOURCES = main.c
mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
-mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la
+mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libuuid_LIBS}
diff --git a/mkfs/main.c b/mkfs/main.c
index 9187c43..7493a48 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -22,6 +22,10 @@
#include "erofs/compress.h"
#include "erofs/xattr.h"
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#endif
+
#define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
static struct option long_options[] = {
@@ -234,6 +238,7 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
*blocks = erofs_mapbh(NULL, true);
sb.blocks = cpu_to_le32(*blocks);
sb.root_nid = cpu_to_le16(root_nid);
+ memcpy(sb.uuid, sbi.uuid, sizeof(sb.uuid));
buf = calloc(sb_blksize, 1);
if (!buf) {
@@ -305,6 +310,20 @@ static int erofs_mkfs_superblock_csum_set(void)
return 0;
}
+static void erofs_mkfs_generate_uuid(void)
+{
+ char uuid_str[37] = "not available";
+
+#ifdef HAVE_LIBUUID
+ do {
+ uuid_generate(sbi.uuid);
+ } while (uuid_is_null(sbi.uuid));
+
+ uuid_unparse_lower(sbi.uuid, uuid_str);
+#endif
+ erofs_info("filesystem UUID: %s", uuid_str);
+}
+
int main(int argc, char **argv)
{
int err = 0;
@@ -376,6 +395,7 @@ int main(int argc, char **argv)
goto exit;
}
+ erofs_mkfs_generate_uuid();
erofs_inode_manager_init();
err = erofs_build_shared_xattrs_from_path(cfg.c_src_path);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4] erofs-utils: support 128-bit filesystem UUID
2019-11-13 3:52 ` [PATCH v3] " Gao Xiang via Linux-erofs
@ 2019-11-13 6:01 ` Gao Xiang via Linux-erofs
2019-11-13 16:36 ` Li Guifu
0 siblings, 1 reply; 6+ messages in thread
From: Gao Xiang via Linux-erofs @ 2019-11-13 6:01 UTC (permalink / raw)
To: Li Guifu, Chao Yu, linux-erofs; +Cc: Miao Xie
Complete filesystem UUID feature on userspace side.
Cc: Chao Yu <yuchao0@huawei.com>
Cc: Li Guifu <bluce.liguifu@huawei.com>
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
---
changes since v3:
- fix configure.ac script and fully passed travis CI
https://travis-ci.org/erofs/erofs-utils-ci/builds/611213382
configure.ac | 41 ++++++++++++++++++++++++++++++++++++++++
include/erofs/internal.h | 1 +
mkfs/Makefile.am | 3 ++-
mkfs/main.c | 20 ++++++++++++++++++++
4 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a93767f..c7dbe0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ AC_PROG_INSTALL
LT_INIT
+# Test presence of pkg-config
+AC_MSG_CHECKING([pkg-config m4 macros])
+if test m4_ifdef([PKG_CHECK_MODULES], [yes], [no]) = "yes"; then
+ AC_MSG_RESULT([yes]);
+else
+ AC_MSG_RESULT([no]);
+ AC_MSG_ERROR([pkg-config is required. See pkg-config.freedesktop.org])
+fi
+
dnl EROFS_UTILS_PARSE_DIRECTORY
dnl Input: $1 = a string to a relative or absolute directory
dnl Output: $2 = the variable to set with the absolute directory
@@ -54,6 +63,10 @@ AC_ARG_ENABLE(lz4,
[AS_HELP_STRING([--disable-lz4], [disable LZ4 compression support @<:@default=enabled@:>@])],
[enable_lz4="$enableval"], [enable_lz4="yes"])
+AC_ARG_WITH(uuid,
+ [AS_HELP_STRING([--without-uuid],
+ [Ignore presence of libuuid and disable uuid support @<:@default=enabled@:>@])])
+
# Checks for libraries.
# Use customized LZ4 library path when specified.
AC_ARG_WITH(lz4-incdir,
@@ -123,6 +136,30 @@ AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE, 1,
# Checks for library functions.
AC_CHECK_FUNCS([fallocate gettimeofday memset realpath strdup strerror strrchr strtoull])
+# Configure libuuid
+AS_IF([test "x$with_uuid" != "xno"], [
+ PKG_CHECK_MODULES([libuuid], [uuid])
+ # Paranoia: don't trust the result reported by pkgconfig before trying out
+ saved_LIBS="$LIBS"
+ saved_CPPFLAGS=${CPPFLAGS}
+ CPPFLAGS="${libuuid_CFLAGS} ${CPPFLAGS}"
+ LIBS="${libuuid_LIBS} $LIBS"
+ AC_MSG_CHECKING([libuuid usability])
+ AC_TRY_LINK([
+#include <uuid.h>
+], [
+uuid_t tmp;
+
+uuid_generate(tmp);
+return 0;
+], [have_uuid="yes"
+ AC_MSG_RESULT([yes])], [
+ have_uuid="no"
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([libuuid doesn't work properly])])
+ LIBS="${saved_LIBS}"
+ CPPFLAGS="${saved_CPPFLAGS}"], [have_uuid="no"])
+
# Configure lz4
test -z $LZ4_LIBS && LZ4_LIBS='-llz4'
@@ -169,6 +206,10 @@ if test "x$enable_lz4" = "xyes"; then
CFLAGS=${saved_CPPFLAGS}
fi
+if test "x$have_uuid" = "xyes"; then
+ AC_DEFINE([HAVE_LIBUUID], 1, [Define to 1 if libuuid is found])
+fi
+
AM_CONDITIONAL([ENABLE_LZ4], [test "x${have_lz4}" = "xyes"])
AM_CONDITIONAL([ENABLE_LZ4HC], [test "x${have_lz4hc}" = "xyes"])
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 9e2bb9c..e13adda 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -56,6 +56,7 @@ struct erofs_sb_info {
u32 feature_incompat;
u64 build_time;
u32 build_time_nsec;
+ u8 uuid[16];
};
/* global sbi */
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 257f864..9ce06d6 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -3,7 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = mkfs.erofs
+AM_CPPFLAGS = ${libuuid_CFLAGS}
mkfs_erofs_SOURCES = main.c
mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
-mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la
+mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libuuid_LIBS}
diff --git a/mkfs/main.c b/mkfs/main.c
index 9187c43..7493a48 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -22,6 +22,10 @@
#include "erofs/compress.h"
#include "erofs/xattr.h"
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#endif
+
#define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
static struct option long_options[] = {
@@ -234,6 +238,7 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh,
*blocks = erofs_mapbh(NULL, true);
sb.blocks = cpu_to_le32(*blocks);
sb.root_nid = cpu_to_le16(root_nid);
+ memcpy(sb.uuid, sbi.uuid, sizeof(sb.uuid));
buf = calloc(sb_blksize, 1);
if (!buf) {
@@ -305,6 +310,20 @@ static int erofs_mkfs_superblock_csum_set(void)
return 0;
}
+static void erofs_mkfs_generate_uuid(void)
+{
+ char uuid_str[37] = "not available";
+
+#ifdef HAVE_LIBUUID
+ do {
+ uuid_generate(sbi.uuid);
+ } while (uuid_is_null(sbi.uuid));
+
+ uuid_unparse_lower(sbi.uuid, uuid_str);
+#endif
+ erofs_info("filesystem UUID: %s", uuid_str);
+}
+
int main(int argc, char **argv)
{
int err = 0;
@@ -376,6 +395,7 @@ int main(int argc, char **argv)
goto exit;
}
+ erofs_mkfs_generate_uuid();
erofs_inode_manager_init();
err = erofs_build_shared_xattrs_from_path(cfg.c_src_path);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4] erofs-utils: support 128-bit filesystem UUID
2019-11-13 6:01 ` [PATCH v4] " Gao Xiang via Linux-erofs
@ 2019-11-13 16:36 ` Li Guifu
0 siblings, 0 replies; 6+ messages in thread
From: Li Guifu @ 2019-11-13 16:36 UTC (permalink / raw)
To: Gao Xiang, Li Guifu, Chao Yu, linux-erofs; +Cc: Miao Xie
On 2019/11/13 14:01, Gao Xiang wrote:
> Complete filesystem UUID feature on userspace side.
>
> Cc: Chao Yu <yuchao0@huawei.com>
> Cc: Li Guifu <bluce.liguifu@huawei.com>
> Signed-off-by: Gao Xiang <hsiangkao@aol.com>
> ---
It looks good
Reviewed-by: Li Guifu <blucerlee@gmail.com>
Tested-by: Li Guifu <blucerlee@gmail.com>
Thanks,
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-13 16:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07 4:03 [PATCH v10 1/2] erofs-utils: support calculating checksum of superblock Gao Xiang
2019-11-07 4:03 ` [PATCH 2/2] erofs-utils: support 128-bit filesystem UUID Gao Xiang
2019-11-08 8:01 ` [PATCH v2] " Gao Xiang
2019-11-13 3:52 ` [PATCH v3] " Gao Xiang via Linux-erofs
2019-11-13 6:01 ` [PATCH v4] " Gao Xiang via Linux-erofs
2019-11-13 16:36 ` Li Guifu
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).