@@ -148,6 +148,10 @@ struct blkid_idmag
long kboff; /* kilobyte offset of superblock */
unsigned int sboff; /* byte offset within superblock */
+
+ int is_zone; /* indicate magic location is calcluated based on zone position */
+ long zonenum; /* zone number which has superblock */
+ long kboff_inzone; /* kilobyte offset of superblock in a zone */
};
/*
@@ -195,6 +199,7 @@ struct blkid_struct_probe
dev_t disk_devno; /* devno of the whole-disk or 0 */
unsigned int blkssz; /* sector size (BLKSSZGET ioctl) */
mode_t mode; /* struct stat.sb_mode */
+ uint64_t zone_size; /* zone size (BLKGETZONESZ ioctl) */
int flags; /* private library flags */
int prob_flags; /* always zeroized by blkid_do_*() */
@@ -94,6 +94,7 @@
#ifdef HAVE_LINUX_CDROM_H
#include <linux/cdrom.h>
#endif
+#include <linux/blkzoned.h>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
@@ -861,6 +862,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
struct stat sb;
uint64_t devsiz = 0;
char *dm_uuid = NULL;
+ uint32_t zone_size_sector;
blkid_reset_probe(pr);
blkid_probe_reset_buffers(pr);
@@ -887,6 +889,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
pr->wipe_off = 0;
pr->wipe_size = 0;
pr->wipe_chain = NULL;
+ pr->zone_size = 0;
if (fd < 0)
return 1;
@@ -951,6 +954,9 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
#endif
free(dm_uuid);
+ if (S_ISBLK(sb.st_mode) && !ioctl(pr->fd, BLKGETZONESZ, &zone_size_sector))
+ pr->zone_size = zone_size_sector << 9;
+
DBG(LOWPROBE, ul_debug("ready for low-probing, offset=%"PRIu64", size=%"PRIu64"",
pr->off, pr->size));
DBG(LOWPROBE, ul_debug("whole-disk: %s, regfile: %s",
@@ -1009,8 +1015,16 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
/* try to detect by magic string */
while(mag && mag->magic) {
unsigned char *buf;
+ uint64_t kboff;
+
+ if (!mag->is_zone)
+ kboff = mag->kboff;
+ else if (pr->zone_size)
+ kboff = ((mag->zonenum * pr->zone_size) >> 10) + mag->kboff_inzone;
+ else
+ goto next;
- off = (mag->kboff + (mag->sboff >> 10)) << 10;
+ off = (kboff + (mag->sboff >> 10)) << 10;
buf = blkid_probe_get_buffer(pr, off, 1024);
if (!buf && errno)
@@ -1020,13 +1034,15 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
buf + (mag->sboff & 0x3ff), mag->len)) {
DBG(LOWPROBE, ul_debug("\tmagic sboff=%u, kboff=%ld",
- mag->sboff, mag->kboff));
+ mag->sboff, kboff));
if (offset)
*offset = off + (mag->sboff & 0x3ff);
if (res)
*res = mag;
return BLKID_PROBE_OK;
}
+
+next:
mag++;
}
@@ -9,6 +9,9 @@
#include <unistd.h>
#include <string.h>
#include <stdint.h>
+#include <stdbool.h>
+
+#include <linux/blkzoned.h>
#include "superblocks.h"
@@ -59,11 +62,128 @@ struct btrfs_super_block {
uint8_t label[256];
} __attribute__ ((__packed__));
+#define BTRFS_SUPER_INFO_SIZE 4096
+#define SECTOR_SHIFT 9
+
+#define READ 0
+#define WRITE 1
+
+typedef uint64_t u64;
+typedef uint64_t sector_t;
+
+static int sb_write_pointer(struct blk_zone *zones, u64 *wp_ret)
+{
+ bool empty[2];
+ bool full[2];
+ sector_t sector;
+
+ if (zones[0].type == BLK_ZONE_TYPE_CONVENTIONAL) {
+ *wp_ret = zones[0].start << SECTOR_SHIFT;
+ return -ENOENT;
+ }
+
+ empty[0] = zones[0].cond == BLK_ZONE_COND_EMPTY;
+ empty[1] = zones[1].cond == BLK_ZONE_COND_EMPTY;
+ full[0] = zones[0].cond == BLK_ZONE_COND_FULL;
+ full[1] = zones[1].cond == BLK_ZONE_COND_FULL;
+
+ /*
+ * Possible state of log buffer zones
+ *
+ * E I F
+ * E * x 0
+ * I 0 x 0
+ * F 1 1 x
+ *
+ * Row: zones[0]
+ * Col: zones[1]
+ * State:
+ * E: Empty, I: In-Use, F: Full
+ * Log position:
+ * *: Special case, no superblock is written
+ * 0: Use write pointer of zones[0]
+ * 1: Use write pointer of zones[1]
+ * x: Invalid state
+ */
+
+ if (empty[0] && empty[1]) {
+ /* special case to distinguish no superblock to read */
+ *wp_ret = zones[0].start << SECTOR_SHIFT;
+ return -ENOENT;
+ } else if (full[0] && full[1]) {
+ /* cannot determine which zone has the newer superblock */
+ return -EUCLEAN;
+ } else if (!full[0] && (empty[1] || full[1])) {
+ sector = zones[0].wp;
+ } else if (full[0]) {
+ sector = zones[1].wp;
+ } else {
+ return -EUCLEAN;
+ }
+ *wp_ret = sector << SECTOR_SHIFT;
+ return 0;
+}
+
+static int sb_log_offset(uint32_t zone_size_sector, blkid_probe pr,
+ uint64_t *offset_ret)
+{
+ uint32_t zone_num = 0;
+ struct blk_zone_report *rep;
+ struct blk_zone *zones;
+ size_t rep_size;
+ int ret;
+ uint64_t wp;
+
+ rep_size = sizeof(struct blk_zone_report) + sizeof(struct blk_zone) * 2;
+ rep = malloc(rep_size);
+ if (!rep)
+ return -errno;
+
+ memset(rep, 0, rep_size);
+ rep->sector = zone_num * zone_size_sector;
+ rep->nr_zones = 2;
+
+ ret = ioctl(pr->fd, BLKREPORTZONE, rep);
+ if (ret)
+ return -errno;
+ if (rep->nr_zones != 2) {
+ free(rep);
+ return 1;
+ }
+
+ zones = (struct blk_zone *)(rep + 1);
+
+ ret = sb_write_pointer(zones, &wp);
+ if (ret != -ENOENT && ret)
+ return -EIO;
+ if (ret != -ENOENT) {
+ if (wp == zones[0].start << SECTOR_SHIFT)
+ wp = (zones[1].start + zones[1].len) << SECTOR_SHIFT;
+ wp -= BTRFS_SUPER_INFO_SIZE;
+ }
+ *offset_ret = wp;
+
+ return 0;
+}
+
static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag)
{
struct btrfs_super_block *bfs;
+ uint32_t zone_size_sector;
+ int ret;
+
+ if (pr->zone_size != 0) {
+ uint64_t offset = 0;
- bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block);
+ ret = sb_log_offset(zone_size_sector, pr, &offset);
+ if (ret)
+ return ret;
+ bfs = (struct btrfs_super_block*)
+ blkid_probe_get_buffer(pr, offset,
+ sizeof(struct btrfs_super_block));
+ } else {
+ bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block);
+ }
if (!bfs)
return errno ? -errno : 1;
@@ -88,6 +208,13 @@ const struct blkid_idinfo btrfs_idinfo =
.magics =
{
{ .magic = "_BHRfS_M", .len = 8, .sboff = 0x40, .kboff = 64 },
+ /* for HMZONED btrfs */
+ { .magic = "!BHRfS_M", .len = 8, .sboff = 0x40,
+ .is_zone = 1, .zonenum = 0, .kboff_inzone = 0 },
+ { .magic = "_BHRfS_M", .len = 8, .sboff = 0x40,
+ .is_zone = 1, .zonenum = 0, .kboff_inzone = 0 },
+ { .magic = "_BHRfS_M", .len = 8, .sboff = 0x40,
+ .is_zone = 1, .zonenum = 1, .kboff_inzone = 0 },
{ NULL }
}
};
This is a work-in-progress and proof-of-concept patch to make libblkid zone-aware. It can probe the magic located at some offset from the beginning of some specific zone of a device. This patch will be split in two patches in the future: - patch to introduce zone aware probing - patch to user it in btrfs probing The first part introduces some new fields to struct blkid_idmag. They indicate the magic location which is placed related to a zone. Also, the first part introduces `zone_size` to struct blkid_struct_probe. It stores the size of zones of a device. The second part use the introduced fields to probe the magic of HMZONED btrfs. Then, it uses the write pointer position to detect the location of the last written superblock. Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> --- libblkid/src/blkidP.h | 5 ++ libblkid/src/probe.c | 20 ++++- libblkid/src/superblocks/btrfs.c | 129 ++++++++++++++++++++++++++++++- 3 files changed, 151 insertions(+), 3 deletions(-)