Skip to content

Commit 3e2cb9e

Browse files
stefanhaRHaxboe
authored andcommitted
block: add IOC_PR_READ_RESERVATION ioctl
Add a Persistent Reservations ioctl to read the current reservation. This calls the pr_ops->read_reservation() function that was previously added in commit c787f1b ("block: Add PR callouts for read keys and reservation") but was only used by the in-kernel SCSI target so far. The IOC_PR_READ_RESERVATION ioctl is necessary so that userspace applications that rely on Persistent Reservations ioctls have a way of inspecting the current state. Cluster managers and validation tests need this functionality. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 22a1ffe commit 3e2cb9e

2 files changed

Lines changed: 35 additions & 0 deletions

File tree

block/ioctl.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,32 @@ static int blkdev_pr_read_keys(struct block_device *bdev, blk_mode_t mode,
477477
return ret;
478478
}
479479

480+
static int blkdev_pr_read_reservation(struct block_device *bdev,
481+
blk_mode_t mode, struct pr_read_reservation __user *arg)
482+
{
483+
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
484+
struct pr_held_reservation rsv = {};
485+
struct pr_read_reservation out = {};
486+
int ret;
487+
488+
if (!blkdev_pr_allowed(bdev, mode))
489+
return -EPERM;
490+
if (!ops || !ops->pr_read_reservation)
491+
return -EOPNOTSUPP;
492+
493+
ret = ops->pr_read_reservation(bdev, &rsv);
494+
if (ret)
495+
return ret;
496+
497+
out.key = rsv.key;
498+
out.generation = rsv.generation;
499+
out.type = rsv.type;
500+
501+
if (copy_to_user(arg, &out, sizeof(out)))
502+
return -EFAULT;
503+
return 0;
504+
}
505+
480506
static int blkdev_flushbuf(struct block_device *bdev, unsigned cmd,
481507
unsigned long arg)
482508
{
@@ -701,6 +727,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,
701727
return blkdev_pr_clear(bdev, mode, argp);
702728
case IOC_PR_READ_KEYS:
703729
return blkdev_pr_read_keys(bdev, mode, argp);
730+
case IOC_PR_READ_RESERVATION:
731+
return blkdev_pr_read_reservation(bdev, mode, argp);
704732
default:
705733
return blk_get_meta_cap(bdev, cmd, argp);
706734
}

include/uapi/linux/pr.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ struct pr_read_keys {
6262
__u64 keys_ptr;
6363
};
6464

65+
struct pr_read_reservation {
66+
__u64 key;
67+
__u32 generation;
68+
__u32 type;
69+
};
70+
6571
#define PR_FL_IGNORE_KEY (1 << 0) /* ignore existing key */
6672

6773
#define IOC_PR_REGISTER _IOW('p', 200, struct pr_registration)
@@ -71,5 +77,6 @@ struct pr_read_keys {
7177
#define IOC_PR_PREEMPT_ABORT _IOW('p', 204, struct pr_preempt)
7278
#define IOC_PR_CLEAR _IOW('p', 205, struct pr_clear)
7379
#define IOC_PR_READ_KEYS _IOWR('p', 206, struct pr_read_keys)
80+
#define IOC_PR_READ_RESERVATION _IOR('p', 207, struct pr_read_reservation)
7481

7582
#endif /* _UAPI_PR_H */

0 commit comments

Comments
 (0)