mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
6d740cd5b1
>============================================= >[ INFO: possible recursive locking detected ] >2.6.19-1.2909.fc7 #1 >--------------------------------------------- >anaconda/587 is trying to acquire lock: > (&bdev->bd_mutex){--..}, at: [<c05fb380>] mutex_lock+0x21/0x24 > >but task is already holding lock: > (&bdev->bd_mutex){--..}, at: [<c05fb380>] mutex_lock+0x21/0x24 > >other info that might help us debug this: >1 lock held by anaconda/587: > #0: (&bdev->bd_mutex){--..}, at: [<c05fb380>] mutex_lock+0x21/0x24 > >stack backtrace: > [<c0405812>] show_trace_log_lvl+0x1a/0x2f > [<c0405db2>] show_trace+0x12/0x14 > [<c0405e36>] dump_stack+0x16/0x18 > [<c043bd84>] __lock_acquire+0x116/0xa09 > [<c043c960>] lock_acquire+0x56/0x6f > [<c05fb1fa>] __mutex_lock_slowpath+0xe5/0x24a > [<c05fb380>] mutex_lock+0x21/0x24 > [<c04d82fb>] blkdev_ioctl+0x600/0x76d > [<c04946b1>] block_ioctl+0x1b/0x1f > [<c047ed5a>] do_ioctl+0x22/0x68 > [<c047eff2>] vfs_ioctl+0x252/0x265 > [<c047f04e>] sys_ioctl+0x49/0x63 > [<c0404070>] syscall_call+0x7/0xb Annotate BLKPG_DEL_PARTITION's bd_mutex locking and add a little comment clarifying the bd_mutex locking, because I confused myself and initially thought the lock order was wrong too. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
305 lines
7.4 KiB
C
305 lines
7.4 KiB
C
#include <linux/capability.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/blkpg.h>
|
|
#include <linux/hdreg.h>
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/smp_lock.h>
|
|
#include <linux/blktrace_api.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg)
|
|
{
|
|
struct block_device *bdevp;
|
|
struct gendisk *disk;
|
|
struct blkpg_ioctl_arg a;
|
|
struct blkpg_partition p;
|
|
long long start, length;
|
|
int part;
|
|
int i;
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
if (copy_from_user(&a, arg, sizeof(struct blkpg_ioctl_arg)))
|
|
return -EFAULT;
|
|
if (copy_from_user(&p, a.data, sizeof(struct blkpg_partition)))
|
|
return -EFAULT;
|
|
disk = bdev->bd_disk;
|
|
if (bdev != bdev->bd_contains)
|
|
return -EINVAL;
|
|
part = p.pno;
|
|
if (part <= 0 || part >= disk->minors)
|
|
return -EINVAL;
|
|
switch (a.op) {
|
|
case BLKPG_ADD_PARTITION:
|
|
start = p.start >> 9;
|
|
length = p.length >> 9;
|
|
/* check for fit in a hd_struct */
|
|
if (sizeof(sector_t) == sizeof(long) &&
|
|
sizeof(long long) > sizeof(long)) {
|
|
long pstart = start, plength = length;
|
|
if (pstart != start || plength != length
|
|
|| pstart < 0 || plength < 0)
|
|
return -EINVAL;
|
|
}
|
|
/* partition number in use? */
|
|
mutex_lock(&bdev->bd_mutex);
|
|
if (disk->part[part - 1]) {
|
|
mutex_unlock(&bdev->bd_mutex);
|
|
return -EBUSY;
|
|
}
|
|
/* overlap? */
|
|
for (i = 0; i < disk->minors - 1; i++) {
|
|
struct hd_struct *s = disk->part[i];
|
|
|
|
if (!s)
|
|
continue;
|
|
if (!(start+length <= s->start_sect ||
|
|
start >= s->start_sect + s->nr_sects)) {
|
|
mutex_unlock(&bdev->bd_mutex);
|
|
return -EBUSY;
|
|
}
|
|
}
|
|
/* all seems OK */
|
|
add_partition(disk, part, start, length, ADDPART_FLAG_NONE);
|
|
mutex_unlock(&bdev->bd_mutex);
|
|
return 0;
|
|
case BLKPG_DEL_PARTITION:
|
|
if (!disk->part[part-1])
|
|
return -ENXIO;
|
|
if (disk->part[part - 1]->nr_sects == 0)
|
|
return -ENXIO;
|
|
bdevp = bdget_disk(disk, part);
|
|
if (!bdevp)
|
|
return -ENOMEM;
|
|
mutex_lock(&bdevp->bd_mutex);
|
|
if (bdevp->bd_openers) {
|
|
mutex_unlock(&bdevp->bd_mutex);
|
|
bdput(bdevp);
|
|
return -EBUSY;
|
|
}
|
|
/* all seems OK */
|
|
fsync_bdev(bdevp);
|
|
invalidate_bdev(bdevp, 0);
|
|
|
|
mutex_lock_nested(&bdev->bd_mutex, 1);
|
|
delete_partition(disk, part);
|
|
mutex_unlock(&bdev->bd_mutex);
|
|
mutex_unlock(&bdevp->bd_mutex);
|
|
bdput(bdevp);
|
|
|
|
return 0;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
static int blkdev_reread_part(struct block_device *bdev)
|
|
{
|
|
struct gendisk *disk = bdev->bd_disk;
|
|
int res;
|
|
|
|
if (disk->minors == 1 || bdev != bdev->bd_contains)
|
|
return -EINVAL;
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
if (!mutex_trylock(&bdev->bd_mutex))
|
|
return -EBUSY;
|
|
res = rescan_partitions(disk, bdev);
|
|
mutex_unlock(&bdev->bd_mutex);
|
|
return res;
|
|
}
|
|
|
|
static int put_ushort(unsigned long arg, unsigned short val)
|
|
{
|
|
return put_user(val, (unsigned short __user *)arg);
|
|
}
|
|
|
|
static int put_int(unsigned long arg, int val)
|
|
{
|
|
return put_user(val, (int __user *)arg);
|
|
}
|
|
|
|
static int put_long(unsigned long arg, long val)
|
|
{
|
|
return put_user(val, (long __user *)arg);
|
|
}
|
|
|
|
static int put_ulong(unsigned long arg, unsigned long val)
|
|
{
|
|
return put_user(val, (unsigned long __user *)arg);
|
|
}
|
|
|
|
static int put_u64(unsigned long arg, u64 val)
|
|
{
|
|
return put_user(val, (u64 __user *)arg);
|
|
}
|
|
|
|
static int blkdev_locked_ioctl(struct file *file, struct block_device *bdev,
|
|
unsigned cmd, unsigned long arg)
|
|
{
|
|
struct backing_dev_info *bdi;
|
|
int ret, n;
|
|
|
|
switch (cmd) {
|
|
case BLKRAGET:
|
|
case BLKFRAGET:
|
|
if (!arg)
|
|
return -EINVAL;
|
|
bdi = blk_get_backing_dev_info(bdev);
|
|
if (bdi == NULL)
|
|
return -ENOTTY;
|
|
return put_long(arg, (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);
|
|
case BLKROGET:
|
|
return put_int(arg, bdev_read_only(bdev) != 0);
|
|
case BLKBSZGET: /* get the logical block size (cf. BLKSSZGET) */
|
|
return put_int(arg, block_size(bdev));
|
|
case BLKSSZGET: /* get block device hardware sector size */
|
|
return put_int(arg, bdev_hardsect_size(bdev));
|
|
case BLKSECTGET:
|
|
return put_ushort(arg, bdev_get_queue(bdev)->max_sectors);
|
|
case BLKRASET:
|
|
case BLKFRASET:
|
|
if(!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
bdi = blk_get_backing_dev_info(bdev);
|
|
if (bdi == NULL)
|
|
return -ENOTTY;
|
|
bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE;
|
|
return 0;
|
|
case BLKBSZSET:
|
|
/* set the logical block size */
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
if (!arg)
|
|
return -EINVAL;
|
|
if (get_user(n, (int __user *) arg))
|
|
return -EFAULT;
|
|
if (bd_claim(bdev, file) < 0)
|
|
return -EBUSY;
|
|
ret = set_blocksize(bdev, n);
|
|
bd_release(bdev);
|
|
return ret;
|
|
case BLKPG:
|
|
return blkpg_ioctl(bdev, (struct blkpg_ioctl_arg __user *) arg);
|
|
case BLKRRPART:
|
|
return blkdev_reread_part(bdev);
|
|
case BLKGETSIZE:
|
|
if ((bdev->bd_inode->i_size >> 9) > ~0UL)
|
|
return -EFBIG;
|
|
return put_ulong(arg, bdev->bd_inode->i_size >> 9);
|
|
case BLKGETSIZE64:
|
|
return put_u64(arg, bdev->bd_inode->i_size);
|
|
case BLKTRACESTART:
|
|
case BLKTRACESTOP:
|
|
case BLKTRACESETUP:
|
|
case BLKTRACETEARDOWN:
|
|
return blk_trace_ioctl(bdev, cmd, (char __user *) arg);
|
|
}
|
|
return -ENOIOCTLCMD;
|
|
}
|
|
|
|
int blkdev_driver_ioctl(struct inode *inode, struct file *file,
|
|
struct gendisk *disk, unsigned cmd, unsigned long arg)
|
|
{
|
|
int ret;
|
|
if (disk->fops->unlocked_ioctl)
|
|
return disk->fops->unlocked_ioctl(file, cmd, arg);
|
|
|
|
if (disk->fops->ioctl) {
|
|
lock_kernel();
|
|
ret = disk->fops->ioctl(inode, file, cmd, arg);
|
|
unlock_kernel();
|
|
return ret;
|
|
}
|
|
|
|
return -ENOTTY;
|
|
}
|
|
EXPORT_SYMBOL_GPL(blkdev_driver_ioctl);
|
|
|
|
int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
|
|
unsigned long arg)
|
|
{
|
|
struct block_device *bdev = inode->i_bdev;
|
|
struct gendisk *disk = bdev->bd_disk;
|
|
int ret, n;
|
|
|
|
switch(cmd) {
|
|
case BLKFLSBUF:
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
|
|
ret = blkdev_driver_ioctl(inode, file, disk, cmd, arg);
|
|
/* -EINVAL to handle old uncorrected drivers */
|
|
if (ret != -EINVAL && ret != -ENOTTY)
|
|
return ret;
|
|
|
|
lock_kernel();
|
|
fsync_bdev(bdev);
|
|
invalidate_bdev(bdev, 0);
|
|
unlock_kernel();
|
|
return 0;
|
|
|
|
case BLKROSET:
|
|
ret = blkdev_driver_ioctl(inode, file, disk, cmd, arg);
|
|
/* -EINVAL to handle old uncorrected drivers */
|
|
if (ret != -EINVAL && ret != -ENOTTY)
|
|
return ret;
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EACCES;
|
|
if (get_user(n, (int __user *)(arg)))
|
|
return -EFAULT;
|
|
lock_kernel();
|
|
set_device_ro(bdev, n);
|
|
unlock_kernel();
|
|
return 0;
|
|
case HDIO_GETGEO: {
|
|
struct hd_geometry geo;
|
|
|
|
if (!arg)
|
|
return -EINVAL;
|
|
if (!disk->fops->getgeo)
|
|
return -ENOTTY;
|
|
|
|
/*
|
|
* We need to set the startsect first, the driver may
|
|
* want to override it.
|
|
*/
|
|
geo.start = get_start_sect(bdev);
|
|
ret = disk->fops->getgeo(bdev, &geo);
|
|
if (ret)
|
|
return ret;
|
|
if (copy_to_user((struct hd_geometry __user *)arg, &geo,
|
|
sizeof(geo)))
|
|
return -EFAULT;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
lock_kernel();
|
|
ret = blkdev_locked_ioctl(file, bdev, cmd, arg);
|
|
unlock_kernel();
|
|
if (ret != -ENOIOCTLCMD)
|
|
return ret;
|
|
|
|
return blkdev_driver_ioctl(inode, file, disk, cmd, arg);
|
|
}
|
|
|
|
/* Most of the generic ioctls are handled in the normal fallback path.
|
|
This assumes the blkdev's low level compat_ioctl always returns
|
|
ENOIOCTLCMD for unknown ioctls. */
|
|
long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
|
|
{
|
|
struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev;
|
|
struct gendisk *disk = bdev->bd_disk;
|
|
int ret = -ENOIOCTLCMD;
|
|
if (disk->fops->compat_ioctl) {
|
|
lock_kernel();
|
|
ret = disk->fops->compat_ioctl(file, cmd, arg);
|
|
unlock_kernel();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkdev_ioctl);
|