qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blktrace: don't centralize grabbing q->debugfs_mutex in blk_trace_ioctl 

JIRA: https://issues.redhat.com/browse/RHEL-79409

commit fd9b0244f5c5f63461ca9752eebd2423ae02bb59
Author: Ming Lei <ming.lei@redhat.com>
Date:   Thu Nov 28 20:50:26 2024 +0800

    blktrace: don't centralize grabbing q->debugfs_mutex in blk_trace_ioctl

    Call each handler directly and the handler do grab q->debugfs_mutex,
    prepare for killing dependency between ->debug_mutex and ->mmap_lock.

    Signed-off-by: Ming Lei <ming.lei@redhat.com>
    Link: https://lore.kernel.org/r/20241128125029.4152292-2-ming.lei@redhat.com
    Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Ming Lei <ming.lei@redhat.com>
This commit is contained in:
Ming Lei 2024-11-28 20:50:26 +08:00
parent a5eb89608e
commit 38b144a09a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/trace/blktrace.c
View File

@ -733,34 +733,32 @@ int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
int ret, start = 0; int ret, start = 0;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
mutex_lock(&q->debugfs_mutex);
switch (cmd) { switch (cmd) {
case BLKTRACESETUP: case BLKTRACESETUP:
snprintf(b, sizeof(b), "%pg", bdev); snprintf(b, sizeof(b), "%pg", bdev);
ret = __blk_trace_setup(q, b, bdev->bd_dev, bdev, arg); ret = blk_trace_setup(q, b, bdev->bd_dev, bdev, arg);
break; break;
#if defined(CONFIG_COMPAT) && defined(CONFIG_X86_64) #if defined(CONFIG_COMPAT) && defined(CONFIG_X86_64)
case BLKTRACESETUP32: case BLKTRACESETUP32:
snprintf(b, sizeof(b), "%pg", bdev); snprintf(b, sizeof(b), "%pg", bdev);
mutex_lock(&q->debugfs_mutex);
ret = compat_blk_trace_setup(q, b, bdev->bd_dev, bdev, arg); ret = compat_blk_trace_setup(q, b, bdev->bd_dev, bdev, arg);
mutex_unlock(&q->debugfs_mutex);
break; break;
#endif #endif
case BLKTRACESTART: case BLKTRACESTART:
start = 1; start = 1;
fallthrough; fallthrough;
case BLKTRACESTOP: case BLKTRACESTOP:
ret = __blk_trace_startstop(q, start); ret = blk_trace_startstop(q, start);
break; break;
case BLKTRACETEARDOWN: case BLKTRACETEARDOWN:
ret = __blk_trace_remove(q); ret = blk_trace_remove(q);
break; break;
default: default:
ret = -ENOTTY; ret = -ENOTTY;
break; break;
} }
mutex_unlock(&q->debugfs_mutex);
return ret; return ret;
} }