block: add IOC_PR_READ_KEYS and IOC_PR_READ_RESERVATION ioctls

[blktests-ci]

Pull request for series with
subject: block: add IOC_PR_READ_KEYS and IOC_PR_READ_RESERVATION ioctls
version: 3
url: https://patchwork.kernel.org/project/linux-block/list/?series=1029438

[blktests-ci]

Upstream branch: c2f2b01
series: https://patchwork.kernel.org/project/linux-block/list/?series=1029438
version: 3

[blktests-ci]

Upstream branch: d26143b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1029438
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1029438
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: scsi: sd: reject invalid pr_read_keys() num_keys values
Using index info to reconstruct a base tree...
M	drivers/scsi/sd.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/scsi/sd.c
No changes -- Patch already applied.
Applying: nvme: reject invalid pr_read_keys() num_keys values
Using index info to reconstruct a base tree...
M	drivers/nvme/host/pr.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: block: add IOC_PR_READ_KEYS ioctl
Using index info to reconstruct a base tree...
M	block/ioctl.c
M	include/uapi/linux/pr.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/linux/pr.h
CONFLICT (content): Merge conflict in include/uapi/linux/pr.h
Auto-merging block/ioctl.c
CONFLICT (content): Merge conflict in block/ioctl.c
Patch failed at 0003 block: add IOC_PR_READ_KEYS ioctl'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc block/ioctl.c
index 344478348a54,95ce9aa90bba..000000000000
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@@ -442,12 -442,11 +442,20 @@@ static int blkdev_pr_read_keys(struct b
  	if (copy_from_user(&read_keys, arg, sizeof(read_keys)))
  		return -EFAULT;
  
++<<<<<<< HEAD
 +	if (read_keys.num_keys > PR_KEYS_MAX)
 +		return -EINVAL;
 +
 +	keys_info_len = struct_size(keys_info, keys, read_keys.num_keys);
 +
 +	keys_info = kvzalloc(keys_info_len, GFP_KERNEL);
++=======
+ 	keys_info_len = struct_size(keys_info, keys, read_keys.num_keys);
+ 	if (keys_info_len == SIZE_MAX)
+ 		return -EINVAL;
+ 
+ 	keys_info = kzalloc(keys_info_len, GFP_KERNEL);
++>>>>>>> block: add IOC_PR_READ_KEYS ioctl
  	if (!keys_info)
  		return -ENOMEM;
  
@@@ -474,36 -473,10 +482,43 @@@
  	if (copy_to_user(arg, &read_keys, sizeof(read_keys)))
  		ret = -EFAULT;
  out:
++<<<<<<< HEAD
 +	kvfree(keys_info);
 +	return ret;
 +}
 +
 +static int blkdev_pr_read_reservation(struct block_device *bdev,
 +		blk_mode_t mode, struct pr_read_reservation __user *arg)
 +{
 +	const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
 +	struct pr_held_reservation rsv = {};
 +	struct pr_read_reservation out = {};
 +	int ret;
 +
 +	if (!blkdev_pr_allowed(bdev, mode))
 +		return -EPERM;
 +	if (!ops || !ops->pr_read_reservation)
 +		return -EOPNOTSUPP;
 +
 +	ret = ops->pr_read_reservation(bdev, &rsv);
 +	if (ret)
 +		return ret;
 +
 +	out.key = rsv.key;
 +	out.generation = rsv.generation;
 +	out.type = rsv.type;
 +
 +	if (copy_to_user(arg, &out, sizeof(out)))
 +		return -EFAULT;
 +	return 0;
 +}
 +
++=======
+ 	kfree(keys_info);
+ 	return ret;
+ }
+ 
++>>>>>>> block: add IOC_PR_READ_KEYS ioctl
  static int blkdev_flushbuf(struct block_device *bdev, unsigned cmd,
  		unsigned long arg)
  {
@@@ -728,8 -700,6 +743,11 @@@ static int blkdev_common_ioctl(struct b
  		return blkdev_pr_clear(bdev, mode, argp);
  	case IOC_PR_READ_KEYS:
  		return blkdev_pr_read_keys(bdev, mode, argp);
++<<<<<<< HEAD
 +	case IOC_PR_READ_RESERVATION:
 +		return blkdev_pr_read_reservation(bdev, mode, argp);
++=======
++>>>>>>> block: add IOC_PR_READ_KEYS ioctl
  	default:
  		return blk_get_meta_cap(bdev, cmd, argp);
  	}
diff --cc include/uapi/linux/pr.h
index f0ecb1677317,fcb74eab92c8..000000000000
--- a/include/uapi/linux/pr.h
+++ b/include/uapi/linux/pr.h
@@@ -62,12 -62,6 +62,15 @@@ struct pr_read_keys 
  	__u64	keys_ptr;
  };
  
++<<<<<<< HEAD
 +struct pr_read_reservation {
 +	__u64	key;
 +	__u32	generation;
 +	__u32	type;
 +};
 +
++=======
++>>>>>>> block: add IOC_PR_READ_KEYS ioctl
  #define PR_FL_IGNORE_KEY	(1 << 0)	/* ignore existing key */
  
  #define IOC_PR_REGISTER		_IOW('p', 200, struct pr_registration)
@@@ -77,8 -71,5 +80,11 @@@
  #define IOC_PR_PREEMPT_ABORT	_IOW('p', 204, struct pr_preempt)
  #define IOC_PR_CLEAR		_IOW('p', 205, struct pr_clear)
  #define IOC_PR_READ_KEYS	_IOWR('p', 206, struct pr_read_keys)
++<<<<<<< HEAD
 +#define IOC_PR_READ_RESERVATION	_IOR('p', 207, struct pr_read_reservation)
 +
 +#define PR_KEYS_MAX		(1u << 16)
++=======
++>>>>>>> block: add IOC_PR_READ_KEYS ioctl
  
  #endif /* _UAPI_PR_H */