* [PATCH V4 0/3] null_blk: add tracepoints for zoned mode
@ 2020-03-25 17:49 Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 1/3] block: add a zone condition debug helper Chaitanya Kulkarni
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-25 17:49 UTC (permalink / raw)
To: linux-block; +Cc: axboe, damien.lemoal, Chaitanya Kulkarni
Hi,
Recently we've added several new operations for zoned block devices
blk-zone.c (ZBD). These operations have a direct effect on the
zone-state machine present in the null_blk_zoned.c.
This will allow us to add new testcases in blktests in order to verify
the correct operations on the driver side.
This is a small patch series which adds tracepoints for the null_blk
block driver when configured in a zoned mode (with command line
parameter zoned=1).
The first patch is a prep patch that adds a helper to stringify zone
conditions which we use in the trace, the second patch adds new
tracepoint definitions and the third patch allows null_blk_zoned to
trace operations.
Please have a look at the end for sample test output which has tests
for CONFIG_BLK_DEV_ZONED and !CONFIG_BLK_DEV_ZONED.
Regards,
Chaitanya
Changes from V3: -
1. Move blk_zone_cond_str() declaration under CONFIG_BLK_DEV_ZONED in
blkdev.h.
Changes from V2 : -
1. Only compile null_blk_trace.c file if tracing and blk_dev_zoned is
enabled.
2. Add a test log with and without CONFIG_BLK_DEV_ZONED.
3. Move Change log to the cover-letter.
4. Declare blk_zone_cond_str() without any CONFIG_BLK_DEV_ZONED
conditions.
5. Add a comment to the ${KDIR_HOME}/drivers/block/Makefile about
whay we need ccflags-y.
6. Fix cover-letter header.
7. Add a copyright banner in null_blk_trace.c.
Changes from V1 : -
1. Move blk_zone_cond_str() to blk-zoned.c.
2. Mark zone_cond_namd array static.
3. Remove BLK_ZONE_COND_LAST.
4. Get rid of inline prefix for blk_zone_cond_str().
5. Use CONFIG_BLK_DEV_ZONE for null_blk_trace.o.
Chaitanya Kulkarni (3):
block: add a zone condition debug helper
null_blk: add tracepoint helpers for zoned mode
null_blk: add trace in null_blk_zoned.c
block/blk-zoned.c | 32 ++++++++++++++
drivers/block/Makefile | 6 +++
drivers/block/null_blk_trace.c | 21 +++++++++
drivers/block/null_blk_trace.h | 79 ++++++++++++++++++++++++++++++++++
drivers/block/null_blk_zoned.c | 12 +++++-
include/linux/blkdev.h | 4 ++
6 files changed, 153 insertions(+), 1 deletion(-)
create mode 100644 drivers/block/null_blk_trace.c
create mode 100644 drivers/block/null_blk_trace.h
Test Results :-
1. With CONFIG_BLK_DEV_ZONED DISABLED :-
----------------------------------------
# zcat /proc/config.gz | grep BLK_DEV_ZONED
# CONFIG_BLK_DEV_ZONED is not set
# makej M=drivers/block
MODPOST 11 modules
CC [M] drivers/block/brd.mod.o
CC [M] drivers/block/floppy.mod.o
CC [M] drivers/block/loop.mod.o
CC [M] drivers/block/mtip32xx/mtip32xx.mod.o
CC [M] drivers/block/null_blk.mod.o <---
CC [M] drivers/block/pktcdvd.mod.o
CC [M] drivers/block/rbd.mod.o
CC [M] drivers/block/sx8.mod.o
CC [M] drivers/block/virtio_blk.mod.o
CC [M] drivers/block/xen-blkfront.mod.o
CC [M] drivers/block/zram/zram.mod.o
LD [M] drivers/block/xen-blkfront.ko
LD [M] drivers/block/brd.ko
LD [M] drivers/block/rbd.ko
LD [M] drivers/block/virtio_blk.ko
LD [M] drivers/block/sx8.ko
LD [M] drivers/block/floppy.ko
LD [M] drivers/block/null_blk.ko <---
LD [M] drivers/block/pktcdvd.ko
LD [M] drivers/block/loop.ko
LD [M] drivers/block/zram/zram.ko
LD [M] drivers/block/mtip32xx/mtip32xx.ko
# insmod drivers/block/null_blk.ko
# dmesg -c
[ 1610.279303] null_blk: loading out-of-tree module taints kernel.
[ 1610.279390] null_blk: module verification failed: signature and/or required key missing - tainting kernel
[ 1610.290823] null_blk: module loaded
# rmmod drivers/block/null_blk.ko
# insmod drivers/block/null_blk.ko zoned=1
insmod: ERROR: could not insert module drivers/block/null_blk.ko: Invalid parameters
# dmesg -c
[ 1627.347747] null_blk: CONFIG_BLK_DEV_ZONED not enabled
# ls /sys/kernel/debug/tracing/events/ | grep null
# echo $?
1
2. With CONFIG_BLK_DEV_ZONED ENABLED :-
---------------------------------------
# zcat /proc/config.gz | grep BLK_DEV_ZONED
CONFIG_BLK_DEV_ZONED=y
# makej M=drivers/block/
AR drivers/block//built-in.a
CC [M] drivers/block//floppy.o
CC [M] drivers/block//brd.o
CC [M] drivers/block//loop.o
CC [M] drivers/block//pktcdvd.o
CC [M] drivers/block//virtio_blk.o
CC [M] drivers/block//zram/zcomp.o
CC [M] drivers/block//mtip32xx/mtip32xx.o
CC [M] drivers/block//sx8.o
CC [M] drivers/block//zram/zram_drv.o
CC [M] drivers/block//rbd.o
CC [M] drivers/block//xen-blkfront.o
CC [M] drivers/block//null_blk_main.o <---
CC [M] drivers/block//null_blk_trace.o <---
CC [M] drivers/block//null_blk_zoned.o <---
LD [M] drivers/block//zram/zram.o
LD [M] drivers/block//null_blk.o
MODPOST 11 modules
CC [M] drivers/block//brd.mod.o
CC [M] drivers/block//floppy.mod.o
CC [M] drivers/block//loop.mod.o
CC [M] drivers/block//mtip32xx/mtip32xx.mod.o
CC [M] drivers/block//null_blk.mod.o <---
CC [M] drivers/block//pktcdvd.mod.o
CC [M] drivers/block//rbd.mod.o
CC [M] drivers/block//sx8.mod.o
CC [M] drivers/block//virtio_blk.mod.o
CC [M] drivers/block//xen-blkfront.mod.o
CC [M] drivers/block//zram/zram.mod.o
LD [M] drivers/block//pktcdvd.ko
LD [M] drivers/block//floppy.ko
LD [M] drivers/block//brd.ko
LD [M] drivers/block//mtip32xx/mtip32xx.ko
LD [M] drivers/block//loop.ko
LD [M] drivers/block//virtio_blk.ko
LD [M] drivers/block//null_blk.ko
LD [M] drivers/block//rbd.ko
LD [M] drivers/block//xen-blkfront.ko
LD [M] drivers/block//sx8.ko
LD [M] drivers/block//zram/zram.ko
# insmod drivers/block/null_blk.ko
# dmesg -c
[ 543.576548] null_blk: module loaded
# lsblk | grep nullb0
nullb0 252:0 0 250G 0 disk
# rmmod null_blk
# insmod drivers/block/null_blk.ko zoned=1 zone_size=128 gb=1
# dmesg -c
[ 543.654579] null_blk: module loaded
# lsblk | grep nullb0
nullb0 252:0 0 1G 0 disk
# blkzone report /dev/nullb0
start: 0x000000000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x000040000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x000080000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x0000c0000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x000100000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x000140000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x000180000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
start: 0x0001c0000, len 0x040000, capacity: 0x040000, wptr 0x000000 reset:0 non-seq:0, zcond: 1(em) [type: 2(SEQ_WRITE_REQUIRED)]
# echo 1 > /sys/kernel/debug/tracing/events/nullb/enable
# for i in open close finish reset; do blkzone $i /dev/nullb0 ; done
# cat /sys/kernel/debug/tracing/trace_pipe
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=0 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=1 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=2 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=3 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=4 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=5 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=6 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_OPEN zone_no=7 zone_cond=EXP_OPEN
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=0 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=1 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=2 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=3 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=4 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=5 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=6 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_CLOSE zone_no=7 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=0 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=1 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=2 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=3 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=4 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=5 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=6 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_FINISH zone_no=7 zone_cond=FULL
nullb_zone_op: disk=nullb0, req=ZONE_RESET_ALL zone_no=0 zone_cond=EMPTY
nullb_zone_op: disk=nullb0, req=WRITE zone_no=0 zone_cond=IMP_OPEN
nullb_zone_op: disk=nullb0, req=WRITE zone_no=0 zone_cond=IMP_OPEN
nullb_zone_op: disk=nullb0, req=WRITE zone_no=0 zone_cond=IMP_OPEN
nullb_zone_op: disk=nullb0, req=WRITE zone_no=0 zone_cond=IMP_OPEN
nullb_zone_op: disk=nullb0, req=WRITE zone_no=0 zone_cond=IMP_OPEN
--
2.22.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V4 1/3] block: add a zone condition debug helper
2020-03-25 17:49 [PATCH V4 0/3] null_blk: add tracepoints for zoned mode Chaitanya Kulkarni
@ 2020-03-25 17:49 ` Chaitanya Kulkarni
2020-03-26 1:26 ` Damien Le Moal
2020-03-25 17:49 ` [PATCH V4 2/3] null_blk: add tracepoint helpers for zoned mode Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 3/3] null_blk: add trace in null_blk_zoned.c Chaitanya Kulkarni
2 siblings, 1 reply; 5+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-25 17:49 UTC (permalink / raw)
To: linux-block; +Cc: axboe, damien.lemoal, Chaitanya Kulkarni
Add a helper to stringify the zone conditions. We use this helper in the
next patch to track zone conditions in tracepoints.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
block/blk-zoned.c | 32 ++++++++++++++++++++++++++++++++
include/linux/blkdev.h | 4 ++++
2 files changed, 36 insertions(+)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 6b442ae96499..f87956e0dcaf 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -20,6 +20,38 @@
#include "blk.h"
+#define ZONE_COND_NAME(name) [BLK_ZONE_COND_##name] = #name
+static const char *const zone_cond_name[] = {
+ ZONE_COND_NAME(NOT_WP),
+ ZONE_COND_NAME(EMPTY),
+ ZONE_COND_NAME(IMP_OPEN),
+ ZONE_COND_NAME(EXP_OPEN),
+ ZONE_COND_NAME(CLOSED),
+ ZONE_COND_NAME(READONLY),
+ ZONE_COND_NAME(FULL),
+ ZONE_COND_NAME(OFFLINE),
+};
+#undef ZONE_COND_NAME
+
+/**
+ * blk_zone_cond_str - Return string XXX in BLK_ZONE_COND_XXX.
+ * @zone_cond: BLK_ZONE_COND_XXX.
+ *
+ * Description: Centralize block layer function to convert BLK_ZONE_COND_XXX
+ * into string format. Useful in the debugging and tracing zone conditions. For
+ * invalid BLK_ZONE_COND_XXX it returns string "UNKNOWN".
+ */
+const char *blk_zone_cond_str(enum blk_zone_cond zone_cond)
+{
+ static const char *zone_cond_str = "UNKNOWN";
+
+ if (zone_cond < ARRAY_SIZE(zone_cond_name) && zone_cond_name[zone_cond])
+ zone_cond_str = zone_cond_name[zone_cond];
+
+ return zone_cond_str;
+}
+EXPORT_SYMBOL_GPL(blk_zone_cond_str);
+
static inline sector_t blk_zone_start(struct request_queue *q,
sector_t sector)
{
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 53a1325efbc3..8ab1f4526f72 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -952,6 +952,10 @@ static inline unsigned int blk_rq_stats_sectors(const struct request *rq)
}
#ifdef CONFIG_BLK_DEV_ZONED
+
+/* Helper to convert BLK_ZONE_ZONE_XXX to its string format XXX */
+const char *blk_zone_cond_str(enum blk_zone_cond zone_cond);
+
static inline unsigned int blk_rq_zone_no(struct request *rq)
{
return blk_queue_zone_no(rq->q, blk_rq_pos(rq));
--
2.22.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V4 2/3] null_blk: add tracepoint helpers for zoned mode
2020-03-25 17:49 [PATCH V4 0/3] null_blk: add tracepoints for zoned mode Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 1/3] block: add a zone condition debug helper Chaitanya Kulkarni
@ 2020-03-25 17:49 ` Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 3/3] null_blk: add trace in null_blk_zoned.c Chaitanya Kulkarni
2 siblings, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-25 17:49 UTC (permalink / raw)
To: linux-block; +Cc: axboe, damien.lemoal, Chaitanya Kulkarni
This patch adds two new tracpoints for null_blk_zoned.c that allows us
to trace report-zones, zone-mgmt-op and zone-write operations which has
direct effect on the zone condition state machine.
Also, we update drivers/block/Makefile so that new null_blk related
tracefiles can be compiled.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
---
drivers/block/Makefile | 6 +++
drivers/block/null_blk_trace.c | 21 +++++++++
drivers/block/null_blk_trace.h | 79 ++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+)
create mode 100644 drivers/block/null_blk_trace.c
create mode 100644 drivers/block/null_blk_trace.h
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a53cc1e3a2d3..795facd8cf19 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -6,6 +6,9 @@
# Rewritten to use lists instead of if-statements.
#
+# needed for trace events
+ccflags-y += -I$(src)
+
obj-$(CONFIG_MAC_FLOPPY) += swim3.o
obj-$(CONFIG_BLK_DEV_SWIM) += swim_mod.o
obj-$(CONFIG_BLK_DEV_FD) += floppy.o
@@ -39,6 +42,9 @@ obj-$(CONFIG_ZRAM) += zram/
obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o
null_blk-objs := null_blk_main.o
+ifeq ($(CONFIG_BLK_DEV_ZONED), y)
+null_blk-$(CONFIG_TRACING) += null_blk_trace.o
+endif
null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
skd-y := skd_main.o
diff --git a/drivers/block/null_blk_trace.c b/drivers/block/null_blk_trace.c
new file mode 100644
index 000000000000..f246e7bff698
--- /dev/null
+++ b/drivers/block/null_blk_trace.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * null_blk trace related helpers.
+ *
+ * Copyright (C) 2020 Western Digital Corporation or its affiliates.
+ */
+#include "null_blk_trace.h"
+
+/*
+ * Helper to use for all null_blk traces to extract disk name.
+ */
+const char *nullb_trace_disk_name(struct trace_seq *p, char *name)
+{
+ const char *ret = trace_seq_buffer_ptr(p);
+
+ if (name && *name)
+ trace_seq_printf(p, "disk=%s, ", name);
+ trace_seq_putc(p, 0);
+
+ return ret;
+}
diff --git a/drivers/block/null_blk_trace.h b/drivers/block/null_blk_trace.h
new file mode 100644
index 000000000000..4f83032eb544
--- /dev/null
+++ b/drivers/block/null_blk_trace.h
@@ -0,0 +1,79 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * null_blk device driver tracepoints.
+ *
+ * Copyright (C) 2020 Western Digital Corporation or its affiliates.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM nullb
+
+#if !defined(_TRACE_NULLB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_NULLB_H
+
+#include <linux/tracepoint.h>
+#include <linux/trace_seq.h>
+
+#include "null_blk.h"
+
+const char *nullb_trace_disk_name(struct trace_seq *p, char *name);
+
+#define __print_disk_name(name) nullb_trace_disk_name(p, name)
+
+#ifndef TRACE_HEADER_MULTI_READ
+static inline void __assign_disk_name(char *name, struct gendisk *disk)
+{
+ if (disk)
+ memcpy(name, disk->disk_name, DISK_NAME_LEN);
+ else
+ memset(name, 0, DISK_NAME_LEN);
+}
+#endif
+
+TRACE_EVENT(nullb_zone_op,
+ TP_PROTO(struct nullb_cmd *cmd, unsigned int zone_no,
+ unsigned int zone_cond),
+ TP_ARGS(cmd, zone_no, zone_cond),
+ TP_STRUCT__entry(
+ __array(char, disk, DISK_NAME_LEN)
+ __field(enum req_opf, op)
+ __field(unsigned int, zone_no)
+ __field(unsigned int, zone_cond)
+ ),
+ TP_fast_assign(
+ __entry->op = req_op(cmd->rq);
+ __entry->zone_no = zone_no;
+ __entry->zone_cond = zone_cond;
+ __assign_disk_name(__entry->disk, cmd->rq->rq_disk);
+ ),
+ TP_printk("%s req=%-15s zone_no=%u zone_cond=%-10s",
+ __print_disk_name(__entry->disk),
+ blk_op_str(__entry->op),
+ __entry->zone_no,
+ blk_zone_cond_str(__entry->zone_cond))
+);
+
+TRACE_EVENT(nullb_report_zones,
+ TP_PROTO(struct nullb *nullb, unsigned int nr_zones),
+ TP_ARGS(nullb, nr_zones),
+ TP_STRUCT__entry(
+ __array(char, disk, DISK_NAME_LEN)
+ __field(unsigned int, nr_zones)
+ ),
+ TP_fast_assign(
+ __entry->nr_zones = nr_zones;
+ __assign_disk_name(__entry->disk, nullb->disk);
+ ),
+ TP_printk("%s nr_zones=%u",
+ __print_disk_name(__entry->disk), __entry->nr_zones)
+);
+
+#endif /* _TRACE_NULLB_H */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE null_blk_trace
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
--
2.22.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V4 3/3] null_blk: add trace in null_blk_zoned.c
2020-03-25 17:49 [PATCH V4 0/3] null_blk: add tracepoints for zoned mode Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 1/3] block: add a zone condition debug helper Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 2/3] null_blk: add tracepoint helpers for zoned mode Chaitanya Kulkarni
@ 2020-03-25 17:49 ` Chaitanya Kulkarni
2 siblings, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2020-03-25 17:49 UTC (permalink / raw)
To: linux-block; +Cc: axboe, damien.lemoal, Chaitanya Kulkarni
With the help of previously added tracepoints we can now trace
report-zones, zone-write and zone-mgmt ops in null_blk_zoned.c.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
---
drivers/block/null_blk_zoned.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/block/null_blk_zoned.c b/drivers/block/null_blk_zoned.c
index ed34785dd64b..673618d8222a 100644
--- a/drivers/block/null_blk_zoned.c
+++ b/drivers/block/null_blk_zoned.c
@@ -2,6 +2,9 @@
#include <linux/vmalloc.h>
#include "null_blk.h"
+#define CREATE_TRACE_POINTS
+#include "null_blk_trace.h"
+
/* zone_size in MBs to sectors. */
#define ZONE_SIZE_SHIFT 11
@@ -80,6 +83,8 @@ int null_report_zones(struct gendisk *disk, sector_t sector,
return 0;
nr_zones = min(nr_zones, dev->nr_zones - first_zone);
+ trace_nullb_report_zones(nullb, nr_zones);
+
for (i = 0; i < nr_zones; i++) {
/*
* Stacked DM target drivers will remap the zone information by
@@ -148,6 +153,8 @@ static blk_status_t null_zone_write(struct nullb_cmd *cmd, sector_t sector,
/* Invalid zone condition */
return BLK_STS_IOERR;
}
+
+ trace_nullb_zone_op(cmd, zno, zone->cond);
return BLK_STS_OK;
}
@@ -155,7 +162,8 @@ static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_opf op,
sector_t sector)
{
struct nullb_device *dev = cmd->nq->dev;
- struct blk_zone *zone = &dev->zones[null_zone_no(dev, sector)];
+ unsigned int zone_no = null_zone_no(dev, sector);
+ struct blk_zone *zone = &dev->zones[zone_no];
size_t i;
switch (op) {
@@ -203,6 +211,8 @@ static blk_status_t null_zone_mgmt(struct nullb_cmd *cmd, enum req_opf op,
default:
return BLK_STS_NOTSUPP;
}
+
+ trace_nullb_zone_op(cmd, zone_no, zone->cond);
return BLK_STS_OK;
}
--
2.22.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V4 1/3] block: add a zone condition debug helper
2020-03-25 17:49 ` [PATCH V4 1/3] block: add a zone condition debug helper Chaitanya Kulkarni
@ 2020-03-26 1:26 ` Damien Le Moal
0 siblings, 0 replies; 5+ messages in thread
From: Damien Le Moal @ 2020-03-26 1:26 UTC (permalink / raw)
To: Chaitanya Kulkarni, linux-block; +Cc: axboe
On 2020/03/26 3:55, Chaitanya Kulkarni wrote:
> Add a helper to stringify the zone conditions. We use this helper in the
> next patch to track zone conditions in tracepoints.
>
> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Looks good to me.
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
> ---
> block/blk-zoned.c | 32 ++++++++++++++++++++++++++++++++
> include/linux/blkdev.h | 4 ++++
> 2 files changed, 36 insertions(+)
>
> diff --git a/block/blk-zoned.c b/block/blk-zoned.c
> index 6b442ae96499..f87956e0dcaf 100644
> --- a/block/blk-zoned.c
> +++ b/block/blk-zoned.c
> @@ -20,6 +20,38 @@
>
> #include "blk.h"
>
> +#define ZONE_COND_NAME(name) [BLK_ZONE_COND_##name] = #name
> +static const char *const zone_cond_name[] = {
> + ZONE_COND_NAME(NOT_WP),
> + ZONE_COND_NAME(EMPTY),
> + ZONE_COND_NAME(IMP_OPEN),
> + ZONE_COND_NAME(EXP_OPEN),
> + ZONE_COND_NAME(CLOSED),
> + ZONE_COND_NAME(READONLY),
> + ZONE_COND_NAME(FULL),
> + ZONE_COND_NAME(OFFLINE),
> +};
> +#undef ZONE_COND_NAME
> +
> +/**
> + * blk_zone_cond_str - Return string XXX in BLK_ZONE_COND_XXX.
> + * @zone_cond: BLK_ZONE_COND_XXX.
> + *
> + * Description: Centralize block layer function to convert BLK_ZONE_COND_XXX
> + * into string format. Useful in the debugging and tracing zone conditions. For
> + * invalid BLK_ZONE_COND_XXX it returns string "UNKNOWN".
> + */
> +const char *blk_zone_cond_str(enum blk_zone_cond zone_cond)
> +{
> + static const char *zone_cond_str = "UNKNOWN";
> +
> + if (zone_cond < ARRAY_SIZE(zone_cond_name) && zone_cond_name[zone_cond])
> + zone_cond_str = zone_cond_name[zone_cond];
> +
> + return zone_cond_str;
> +}
> +EXPORT_SYMBOL_GPL(blk_zone_cond_str);
> +
> static inline sector_t blk_zone_start(struct request_queue *q,
> sector_t sector)
> {
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 53a1325efbc3..8ab1f4526f72 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -952,6 +952,10 @@ static inline unsigned int blk_rq_stats_sectors(const struct request *rq)
> }
>
> #ifdef CONFIG_BLK_DEV_ZONED
> +
> +/* Helper to convert BLK_ZONE_ZONE_XXX to its string format XXX */
> +const char *blk_zone_cond_str(enum blk_zone_cond zone_cond);
> +
> static inline unsigned int blk_rq_zone_no(struct request *rq)
> {
> return blk_queue_zone_no(rq->q, blk_rq_pos(rq));
>
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-26 1:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 17:49 [PATCH V4 0/3] null_blk: add tracepoints for zoned mode Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 1/3] block: add a zone condition debug helper Chaitanya Kulkarni
2020-03-26 1:26 ` Damien Le Moal
2020-03-25 17:49 ` [PATCH V4 2/3] null_blk: add tracepoint helpers for zoned mode Chaitanya Kulkarni
2020-03-25 17:49 ` [PATCH V4 3/3] null_blk: add trace in null_blk_zoned.c Chaitanya Kulkarni
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).