admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

blktrace: add block trace commands for zone operations

Browse Source 
Add block trace commands for zone operations. These commands can only be
handled with version 2 of the blktrace protocol. For version 1, warn if a
command that does not fit into the 16 bits reserved for the command in
this version is passed in.

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Johannes Thumshirn
2025-10-22 13:41:12 +02:00
committed by Jens Axboe
parent 4d8bc7bd4f
commit f9ee38bbf7
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/uapi/linux/blktrace_api.h
View File

@@ -26,11 +26,20 @@ enum blktrace_cat {
BLK_TC_DRV_DATA = 1 << 14, /* binary per-driver data */
BLK_TC_FUA = 1 << 15, /* fua requests */
BLK_TC_END = 1 << 15, /* we've run out of bits! */
BLK_TC_END_V1 = 1 << 15, /* we've run out of bits! */
BLK_TC_ZONE_APPEND = 1ull << 16, /* zone append */
BLK_TC_ZONE_RESET = 1ull << 17, /* zone reset */
BLK_TC_ZONE_RESET_ALL = 1ull << 18, /* zone reset all */
BLK_TC_ZONE_FINISH = 1ull << 19, /* zone finish */
BLK_TC_ZONE_OPEN = 1ull << 20, /* zone open */
BLK_TC_ZONE_CLOSE = 1ull << 21, /* zone close */
BLK_TC_END_V2 = 1ull << 21,
};
#define BLK_TC_SHIFT (16)
#define BLK_TC_ACT(act) ((act) << BLK_TC_SHIFT)
#define BLK_TC_ACT(act) ((u64)(act) << BLK_TC_SHIFT)
/*
* Basic trace actions

29
kernel/trace/blktrace.c
View File

@@ -163,8 +163,8 @@ static void relay_blktrace_event(struct blk_trace *bt, unsigned long sequence,
bytes, what, error, cgid, cgid_len,
pdu_data, pdu_len);
return relay_blktrace_event1(bt, sequence, pid, cpu, sector, bytes,
lower_32_bits(what), error, cgid, cgid_len,
pdu_data, pdu_len);
what, error, cgid, cgid_len, pdu_data,
pdu_len);
}
/*
@@ -342,10 +342,32 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
case REQ_OP_FLUSH:
what |= BLK_TC_ACT(BLK_TC_FLUSH);
break;
case REQ_OP_ZONE_APPEND:
what |= BLK_TC_ACT(BLK_TC_ZONE_APPEND);
break;
case REQ_OP_ZONE_RESET:
what |= BLK_TC_ACT(BLK_TC_ZONE_RESET);
break;
case REQ_OP_ZONE_RESET_ALL:
what |= BLK_TC_ACT(BLK_TC_ZONE_RESET_ALL);
break;
case REQ_OP_ZONE_FINISH:
what |= BLK_TC_ACT(BLK_TC_ZONE_FINISH);
break;
case REQ_OP_ZONE_OPEN:
what |= BLK_TC_ACT(BLK_TC_ZONE_OPEN);
break;
case REQ_OP_ZONE_CLOSE:
what |= BLK_TC_ACT(BLK_TC_ZONE_CLOSE);
break;
default:
break;
}
if (WARN_ON_ONCE(bt->version == 1 &&
(what >> BLK_TC_SHIFT) > BLK_TC_END_V1))
return;
if (cgid)
what |= __BLK_TA_CGROUP;
@@ -386,8 +408,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
sequence = per_cpu_ptr(bt->sequence, cpu);
(*sequence)++;
relay_blktrace_event(bt, *sequence, pid, cpu, sector, bytes,
lower_32_bits(what), error, cgid, cgid_len,
pdu_data, pdu_len);
what, error, cgid, cgid_len, pdu_data, pdu_len);
local_irq_restore(flags);
}