[PATCH] libblkid: Add support for zonefs

* [PATCH] libblkid: Add support for zonefs
@ 2020-03-20  4:55 Damien Le Moal
  2020-03-23 10:33 ` Karel Zak
  0 siblings, 1 reply; 5+ messages in thread
From: Damien Le Moal @ 2020-03-20  4:55 UTC (permalink / raw)
  To: util-linux, Karel Zak, Benno Schulenberg

The zonefs filesystem was added to upstream linux kernel 5.6. This
patch add support for probing zonefs formatted zoned block devices so
that other file system formatting tool can detect its presence on a
device.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
 libblkid/src/Makemodule.am             |  1 +
 libblkid/src/superblocks/superblocks.c |  3 +-
 libblkid/src/superblocks/superblocks.h |  1 +
 libblkid/src/superblocks/zonefs.c      | 87 ++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 libblkid/src/superblocks/zonefs.c

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index c5d9426b1..394c2ed43 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -101,6 +101,7 @@ libblkid_la_SOURCES = \
 	libblkid/src/superblocks/vxfs.c \
 	libblkid/src/superblocks/xfs.c \
 	libblkid/src/superblocks/zfs.c \
+	libblkid/src/superblocks/zonefs.c \
 	\
 	libblkid/src/topology/topology.c \
 	libblkid/src/topology/topology.h
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index baf35e51b..67172d0a0 100644
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -167,7 +167,8 @@ static const struct blkid_idinfo *idinfos[] =
 	&exfat_idinfo,
 	&f2fs_idinfo,
 	&mpool_idinfo,
-	&apfs_idinfo
+	&apfs_idinfo,
+	&zonefs_idinfo
 };
 
 /*
diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 0cd0caccf..5ebe6bc43 100644
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -84,6 +84,7 @@ extern const struct blkid_idinfo vdo_idinfo;
 extern const struct blkid_idinfo stratis_idinfo;
 extern const struct blkid_idinfo bitlocker_idinfo;
 extern const struct blkid_idinfo apfs_idinfo;
+extern const struct blkid_idinfo zonefs_idinfo;
 
 /*
  * superblock functions
diff --git a/libblkid/src/superblocks/zonefs.c b/libblkid/src/superblocks/zonefs.c
new file mode 100644
index 000000000..aa5d2e1bd
--- /dev/null
+++ b/libblkid/src/superblocks/zonefs.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2020 Western Digital Corporation or its affiliates.
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License
+ */
+#include <stddef.h>
+#include <string.h>
+#include <uuid/uuid.h>
+
+#include "superblocks.h"
+
+#define ZONEFS_MAGIC		"SFOZ" /* 0x5a4f4653 'Z' 'O' 'F' 'S' */
+#define ZONEFS_MAGIC_SIZE	4
+#define ZONEFS_MAGIC_OFST	0
+#define ZONEFS_UUID_SIZE	16
+#define ZONEFS_LABEL_SIZE	32
+#define ZONEFS_SB_OFST		0
+
+#define ZONEFS_BLOCK_SIZE	4096U
+
+struct zonefs_super {
+
+	/* Magic number */
+	__le32		s_magic;
+
+	/* Checksum */
+	__le32		s_crc;
+
+	/* Volume label */
+	char		s_label[ZONEFS_LABEL_SIZE];
+
+	/* 128-bit uuid */
+	__u8		s_uuid[ZONEFS_UUID_SIZE];
+
+	/* Features */
+	__le64		s_features;
+
+	/* UID/GID to use for files */
+	__le32		s_uid;
+	__le32		s_gid;
+
+	/* File permissions */
+	__le32		s_perm;
+
+	/* Padding to 4096 bytes */
+	/* __u8		s_reserved[4020]; */
+
+} __attribute__ ((packed));
+
+static int probe_zonefs(blkid_probe pr,
+		const struct blkid_idmag *mag  __attribute__((__unused__)))
+{
+	struct zonefs_super *sb;
+
+	sb = (struct zonefs_super *)
+		blkid_probe_get_buffer(pr, ZONEFS_SB_OFST,
+				       sizeof(struct zonefs_super));
+	if (!sb)
+		return errno ? -errno : 1;
+
+	if (sb->s_label[0])
+		blkid_probe_set_label(pr, (unsigned char *) sb->s_label,
+				      sizeof(sb->s_label));
+
+	blkid_probe_set_uuid(pr, sb->s_uuid);
+	blkid_probe_set_block_size(pr, ZONEFS_BLOCK_SIZE);
+
+	return 0;
+}
+
+const struct blkid_idinfo zonefs_idinfo =
+{
+	.name           = "zonefs",
+	.usage          = BLKID_USAGE_FILESYSTEM,
+	.probefunc      = probe_zonefs,
+	.magics         =
+        {
+		{
+			.magic = (char *)ZONEFS_MAGIC,
+			.len = ZONEFS_MAGIC_SIZE,
+			.kboff = ZONEFS_SB_OFST,
+			.sboff = ZONEFS_MAGIC_OFST,
+		},
+		{ NULL }
+	}
+};
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread