Commit 62ab1aad authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Damien Le Moal
Browse files

zonefs: add tracepoints for file operations 



Add tracepoints for file I/O operations to aid in debugging of I/O errors
with zonefs.

The added tracepoints are in:
- zonefs_zone_mgmt() for tracing zone management operations
- zonefs_iomap_begin() for tracing regular file I/O
- zonefs_file_dio_append() for tracing zone-append operations

Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
parent 6ee1d745

fs/zonefs/Makefile

+2 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

ccflags-y				+= -I$(src)



obj-$(CONFIG_ZONEFS_FS) += zonefs.o

obj-$(CONFIG_ZONEFS_FS) += zonefs.o





zonefs-y	:= super.o
 
zonefs-y	:= super.o

fs/zonefs/super.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ 




#include "zonefs.h"

#include "zonefs.h"





#define CREATE_TRACE_POINTS

#include "trace.h"



static inline int zonefs_zone_mgmt(struct inode *inode,

static inline int zonefs_zone_mgmt(struct inode *inode,

				   enum req_opf op)

				   enum req_opf op)

{

{
@@ -32,6 +35,7 @@ static inline int zonefs_zone_mgmt(struct inode *inode, 




	lockdep_assert_held(&zi->i_truncate_mutex);

	lockdep_assert_held(&zi->i_truncate_mutex);





	trace_zonefs_zone_mgmt(inode, op);

	ret = blkdev_zone_mgmt(inode->i_sb->s_bdev, op, zi->i_zsector,

	ret = blkdev_zone_mgmt(inode->i_sb->s_bdev, op, zi->i_zsector,

			       zi->i_zone_size >> SECTOR_SHIFT, GFP_NOFS);

			       zi->i_zone_size >> SECTOR_SHIFT, GFP_NOFS);

	if (ret) {

	if (ret) {
@@ -100,6 +104,8 @@ static int zonefs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
	iomap->bdev = inode->i_sb->s_bdev;

	iomap->bdev = inode->i_sb->s_bdev;

	iomap->addr = (zi->i_zsector << SECTOR_SHIFT) + iomap->offset;

	iomap->addr = (zi->i_zsector << SECTOR_SHIFT) + iomap->offset;





	trace_zonefs_iomap_begin(inode, iomap);



	return 0;

	return 0;

}

}
@@ -703,6 +709,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from) 
	ret = submit_bio_wait(bio);

	ret = submit_bio_wait(bio);





	zonefs_file_write_dio_end_io(iocb, size, ret, 0);

	zonefs_file_write_dio_end_io(iocb, size, ret, 0);

	trace_zonefs_file_dio_append(inode, size, ret);





out_release:

out_release:

	bio_release_pages(bio, false);

	bio_release_pages(bio, false);

fs/zonefs/trace.h

0 → 100644
+104 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * zonefs filesystem driver tracepoints.

 *

 * Copyright (C) 2021 Western Digital Corporation or its affiliates.

 */



#undef TRACE_SYSTEM

#define TRACE_SYSTEM zonefs



#if !defined(_TRACE_ZONEFS_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_ZONEFS_H



#include <linux/tracepoint.h>

#include <linux/trace_seq.h>

#include <linux/blkdev.h>



#include "zonefs.h"



#define show_dev(dev) MAJOR(dev), MINOR(dev)



TRACE_EVENT(zonefs_zone_mgmt,

	    TP_PROTO(struct inode *inode, enum req_opf op),

	    TP_ARGS(inode, op),

	    TP_STRUCT__entry(

			     __field(dev_t, dev)

			     __field(ino_t, ino)

			     __field(int, op)

			     __field(sector_t, sector)

			     __field(sector_t, nr_sectors)

	    ),

	    TP_fast_assign(

			   __entry->dev = inode->i_sb->s_dev;

			   __entry->ino = inode->i_ino;

			   __entry->op = op;

			   __entry->sector = ZONEFS_I(inode)->i_zsector;

			   __entry->nr_sectors =

				   ZONEFS_I(inode)->i_zone_size >> SECTOR_SHIFT;

	    ),

	    TP_printk("bdev=(%d,%d), ino=%lu op=%s, sector=%llu, nr_sectors=%llu",

		      show_dev(__entry->dev), (unsigned long)__entry->ino,

		      blk_op_str(__entry->op), __entry->sector,

		      __entry->nr_sectors

	    )

);



TRACE_EVENT(zonefs_file_dio_append,

	    TP_PROTO(struct inode *inode, ssize_t size, ssize_t ret),

	    TP_ARGS(inode, size, ret),

	    TP_STRUCT__entry(

			     __field(dev_t, dev)

			     __field(ino_t, ino)

			     __field(sector_t, sector)

			     __field(ssize_t, size)

			     __field(loff_t, wpoffset)

			     __field(ssize_t, ret)

	    ),

	    TP_fast_assign(

			   __entry->dev = inode->i_sb->s_dev;

			   __entry->ino = inode->i_ino;

			   __entry->sector = ZONEFS_I(inode)->i_zsector;

			   __entry->size = size;

			   __entry->wpoffset = ZONEFS_I(inode)->i_wpoffset;

			   __entry->ret = ret;

	    ),

	    TP_printk("bdev=(%d, %d), ino=%lu, sector=%llu, size=%zu, wpoffset=%llu, ret=%zu",

		      show_dev(__entry->dev), (unsigned long)__entry->ino,

		      __entry->sector, __entry->size, __entry->wpoffset,

		      __entry->ret

	    )

);



TRACE_EVENT(zonefs_iomap_begin,

	    TP_PROTO(struct inode *inode, struct iomap *iomap),

	    TP_ARGS(inode, iomap),

	    TP_STRUCT__entry(

			     __field(dev_t, dev)

			     __field(ino_t, ino)

			     __field(u64, addr)

			     __field(loff_t, offset)

			     __field(u64, length)

	    ),

	    TP_fast_assign(

			   __entry->dev = inode->i_sb->s_dev;

			   __entry->ino = inode->i_ino;

			   __entry->addr = iomap->addr;

			   __entry->offset = iomap->offset;

			   __entry->length = iomap->length;

	    ),

	    TP_printk("bdev=(%d,%d), ino=%lu, addr=%llu, offset=%llu, length=%llu",

		      show_dev(__entry->dev), (unsigned long)__entry->ino,

		      __entry->addr, __entry->offset, __entry->length

	    )

);



#endif /* _TRACE_ZONEFS_H */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE trace



/* This part must be outside protection */

#include <trace/define_trace.h>