summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJohannes Thumshirn <johannes.thumshirn@wdc.com>2025-10-22 13:41:12 +0200
committerJens Axboe <axboe@kernel.dk>2025-10-22 11:14:05 -0600
commitf9ee38bbf70fb20584625849a253c8652176fa66 (patch)
treeed9139db1d88064a92dc3427a936e26f5be380ac /kernel
parent4d8bc7bd4f73c6b34ba29d3e8277864c6e0a44a7 (diff)
blktrace: add block trace commands for zone operations
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/blktrace.c29
1 files changed, 25 insertions, 4 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 49f73cb3cb33..fb5935885abc 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -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);
}