Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4209c31c authored by Hans Holmberg's avatar Hans Holmberg Committed by Jens Axboe
Browse files

lightnvm: pblk: add tracing for chunk resets 



Trace state of chunk resets.

Signed-off-by: default avatarHans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1b0dd0bf

drivers/lightnvm/pblk-core.c

+12 −0
Original line number Diff line number Diff line
@@ -90,9 +90,15 @@ static void __pblk_end_io_erase(struct pblk *pblk, struct nvm_rq *rqd) 
	atomic_dec(&line->left_seblks);



	if (rqd->error) {

		trace_pblk_chunk_reset(pblk_disk_name(pblk),

				&rqd->ppa_addr, PBLK_CHUNK_RESET_FAILED);



		chunk->state = NVM_CHK_ST_OFFLINE;

		pblk_mark_bb(pblk, line, rqd->ppa_addr);

	} else {

		trace_pblk_chunk_reset(pblk_disk_name(pblk),

				&rqd->ppa_addr, PBLK_CHUNK_RESET_DONE);



		chunk->state = NVM_CHK_ST_FREE;

	}
@@ -923,6 +929,9 @@ static int pblk_blk_erase_sync(struct pblk *pblk, struct ppa_addr ppa) 
	struct nvm_rq rqd = {NULL};

	int ret;



	trace_pblk_chunk_reset(pblk_disk_name(pblk), &ppa,

				PBLK_CHUNK_RESET_START);



	pblk_setup_e_rq(pblk, &rqd, ppa);



	/* The write thread schedules erases so that it minimizes disturbances
@@ -1736,6 +1745,9 @@ int pblk_blk_erase_async(struct pblk *pblk, struct ppa_addr ppa) 
	rqd->end_io = pblk_end_io_erase;

	rqd->private = pblk;



	trace_pblk_chunk_reset(pblk_disk_name(pblk),

				&ppa, PBLK_CHUNK_RESET_START);



	/* The write thread schedules erases so that it minimizes disturbances

	 * with writes. Thus, there is no need to take the LUN semaphore.

	 */

drivers/lightnvm/pblk-trace.h

+31 −0
Original line number Diff line number Diff line
@@ -31,6 +31,37 @@ struct ppa_addr; 
	{ PBLK_STATE_RECOVERING,	"RECOVERING",	},	\

	{ PBLK_STATE_STOPPED,		"STOPPED"	})



#define show_chunk_erase_state(state) __print_symbolic(state,	\

	{ PBLK_CHUNK_RESET_START,	"START",	},	\

	{ PBLK_CHUNK_RESET_DONE,	"OK",		},	\

	{ PBLK_CHUNK_RESET_FAILED,	"FAILED"	})





TRACE_EVENT(pblk_chunk_reset,



	TP_PROTO(const char *name, struct ppa_addr *ppa, int state),



	TP_ARGS(name, ppa, state),



	TP_STRUCT__entry(

		__string(name, name)

		__field(u64, ppa)

		__field(int, state);

	),



	TP_fast_assign(

		__assign_str(name, name);

		__entry->ppa = ppa->ppa;

		__entry->state = state;

	),



	TP_printk("dev=%s grp=%llu pu=%llu chk=%llu state=%s", __get_str(name),

			(u64)(((struct ppa_addr *)(&__entry->ppa))->m.grp),

			(u64)(((struct ppa_addr *)(&__entry->ppa))->m.pu),

			(u64)(((struct ppa_addr *)(&__entry->ppa))->m.chk),

			show_chunk_erase_state((int)__entry->state))



);



TRACE_EVENT(pblk_chunk_state,

drivers/lightnvm/pblk.h

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ enum { 
	PBLK_BLK_ST_CLOSED =	0x2,

};



enum {

	PBLK_CHUNK_RESET_START,

	PBLK_CHUNK_RESET_DONE,

	PBLK_CHUNK_RESET_FAILED,

};



struct pblk_sec_meta {

	u64 reserved;

	__le64 lba;