superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blktrace: pass blk_user_trace2 to setup functions 

Pass struct blk_user_trace_setup2 to blktrace_setup_finalize(). This
prepares for the incoming extension of the blktrace protocol with a 64bit
act_mask.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
Johannes Thumshirn 2025-10-22 13:41:07 +02:00 committed by Jens Axboe
parent 0d8627cc93
commit 113cbd6282
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/blktrace_api.h
View File

@ -14,11 +14,12 @@
#include <linux/sysfs.h>
struct blk_trace {
int version;
int trace_state;
struct rchan *rchan;
unsigned long __percpu *sequence;
unsigned char __percpu *msg_data;
u16 act_mask;
u64 act_mask;
u64 start_lba;
u64 end_lba;
u32 pid;

31
kernel/trace/blktrace.c
View File

@ -597,11 +597,12 @@ err:
}
static void blk_trace_setup_finalize(struct request_queue *q,
char *name, struct blk_trace *bt,
struct blk_user_trace_setup *buts)
char *name, int version,
struct blk_trace *bt,
struct blk_user_trace_setup2 *buts)
{
strscpy_pad(buts->name, name, BLKTRACE_BDEV_SIZE);
strscpy_pad(buts->name, name, BLKTRACE_BDEV_SIZE2);
/*
* some device names have larger paths - convert the slashes
@ -609,6 +610,7 @@ static void blk_trace_setup_finalize(struct request_queue *q,
*/
strreplace(buts->name, '/', '_');
bt->version = version;
bt->act_mask = buts->act_mask;
if (!bt->act_mask)
bt->act_mask = (u16) -1;
@ -630,6 +632,7 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
struct block_device *bdev,
char __user *arg)
{
struct blk_user_trace_setup2 buts2;
struct blk_user_trace_setup buts;
struct blk_trace *bt;
int ret;
@ -641,6 +644,15 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
if (!buts.buf_size || !buts.buf_nr)
return -EINVAL;
buts2 = (struct blk_user_trace_setup2) {
.act_mask = buts.act_mask,
.buf_size = buts.buf_size,
.buf_nr = buts.buf_nr,
.start_lba = buts.start_lba,
.end_lba = buts.end_lba,
.pid = buts.pid,
};
mutex_lock(&q->debugfs_mutex);
bt = blk_trace_setup_prepare(q, name, dev, buts.buf_size, buts.buf_nr,
bdev);
@ -648,7 +660,8 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
mutex_unlock(&q->debugfs_mutex);
return PTR_ERR(bt);
}
blk_trace_setup_finalize(q, name, bt, &buts);
blk_trace_setup_finalize(q, name, 1, bt, &buts2);
strcpy(buts.name, buts2.name);
mutex_unlock(&q->debugfs_mutex);
if (copy_to_user(arg, &buts, sizeof(buts))) {
@ -664,7 +677,7 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
dev_t dev, struct block_device *bdev,
char __user *arg)
{
struct blk_user_trace_setup buts;
struct blk_user_trace_setup2 buts2;
struct compat_blk_user_trace_setup cbuts;
struct blk_trace *bt;
@ -674,7 +687,7 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
if (!cbuts.buf_size || !cbuts.buf_nr)
return -EINVAL;
buts = (struct blk_user_trace_setup) {
buts2 = (struct blk_user_trace_setup2) {
.act_mask = cbuts.act_mask,
.buf_size = cbuts.buf_size,
.buf_nr = cbuts.buf_nr,
@ -684,16 +697,16 @@ static int compat_blk_trace_setup(struct request_queue *q, char *name,
};
mutex_lock(&q->debugfs_mutex);
bt = blk_trace_setup_prepare(q, name, dev, buts.buf_size, buts.buf_nr,
bt = blk_trace_setup_prepare(q, name, dev, buts2.buf_size, buts2.buf_nr,
bdev);
if (IS_ERR(bt)) {
mutex_unlock(&q->debugfs_mutex);
return PTR_ERR(bt);
}
blk_trace_setup_finalize(q, name, bt, &buts);
blk_trace_setup_finalize(q, name, 1, bt, &buts2);
mutex_unlock(&q->debugfs_mutex);
if (copy_to_user(arg, &buts.name, ARRAY_SIZE(buts.name))) {
if (copy_to_user(arg, &buts2.name, ARRAY_SIZE(buts2.name))) {
blk_trace_remove(q);
return -EFAULT;
}