[V4,1/3] block: add a zone condition debug helper
diff mbox series

Message ID 20200325174956.16719-2-chaitanya.kulkarni@wdc.com
State New
Headers show
Series
  • null_blk: add tracepoints for zoned mode
Related show

Commit Message

Chaitanya Kulkarni March 25, 2020, 5:49 p.m. UTC
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(+)

Comments

Damien Le Moal March 26, 2020, 1:26 a.m. UTC | #1
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));
>

Patch
diff mbox series

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));