From: Ackerley Tng Move the MPS_CTL_SET_PRESENT ioctl from the /dev/mem_provider_sample control device to become MPS_SET_PRESENT directly on the provider file descriptor itself. Calling MPS_SET_PRESENT directly on the provider file eliminates the need to pass a file descriptor in the ioctl argument. Signed-off-by: Ackerley Tng --- samples/kvm/mem_provider_sample.c | 90 ++++++++++++++------------------------- samples/kvm/mem_provider_sample.h | 14 +++--- 2 files changed, 40 insertions(+), 64 deletions(-) diff --git a/samples/kvm/mem_provider_sample.c b/samples/kvm/mem_provider_sample.c index a8d40f3c631ed..397ebb3773f39 100644 --- a/samples/kvm/mem_provider_sample.c +++ b/samples/kvm/mem_provider_sample.c @@ -36,7 +36,7 @@ struct mps_info { unsigned long npages; struct page *cma_pages; /* from alloc_contig_pages() */ - unsigned long *absent; /* taken away by CTL_SET_PRESENT */ + unsigned long *absent; /* taken away by MPS_SET_PRESENT */ }; /* Byte range [offset, offset + len) of @info as page indices. */ @@ -75,21 +75,6 @@ static long mps_get_stats(struct mps_info *info, void __user *uarg) return copy_to_user(uarg, &st, sizeof(st)) ? -EFAULT : 0; } -/* - * A provider fd is read-only to its holder: only GET_STATS. The owner changes - * a file's pages through the control device (MPS_CTL_SET_PRESENT). - */ -static long mps_file_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - struct mps_info *info = file->private_data; - void __user *uarg = (void __user *)arg; - - if (cmd == MPS_GET_STATS) - return mps_get_stats(info, uarg); - return -ENOTTY; -} - static int mps_file_release(struct inode *inode, struct file *file) { struct mps_info *info = file->private_data; @@ -101,6 +86,38 @@ static int mps_file_release(struct inode *inode, struct file *file) return 0; } +static long mps_file_set_present(struct mps_info *info, void __user *uarg) +{ + struct mps_set_present sp; + unsigned long start, end; + int ret; + + if (copy_from_user(&sp, uarg, sizeof(sp))) + return -EFAULT; + if (sp.value > 1 || sp.pad) + return -EINVAL; + ret = mps_range(info, sp.offset, sp.len, &start, &end); + if (!ret) + mps_set_present(info, start, end, sp.value); + return ret; +} + +static long mps_file_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + struct mps_info *info = file->private_data; + void __user *uarg = (void __user *)arg; + + switch (cmd) { + case MPS_GET_STATS: + return mps_get_stats(info, uarg); + case MPS_SET_PRESENT: + return mps_file_set_present(info, uarg); + default: + return -ENOTTY; + } +} + static const struct file_operations mps_file_fops = { .owner = THIS_MODULE, .release = mps_file_release, @@ -108,20 +125,6 @@ static const struct file_operations mps_file_fops = { .compat_ioctl = compat_ptr_ioctl, }; -static struct file *mps_get_file(int fd, struct mps_info **infop) -{ - struct file *file = fget(fd); - - if (!file) - return ERR_PTR(-EBADF); - if (file->f_op != &mps_file_fops) { - fput(file); - return ERR_PTR(-EINVAL); - } - *infop = file->private_data; - return file; -} - static long mps_ctl_new_file(void __user *uarg) { struct mps_new_file nf; @@ -190,31 +193,6 @@ static long mps_ctl_new_file(void __user *uarg) return ret; } -/* - * CTL_SET_PRESENT changes a file's pages, by the owner on the control device. - */ -static long mps_ctl_set_present(void __user *uarg) -{ - struct mps_ctl_range cr; - unsigned long start, end; - struct mps_info *info; - struct file *file; - int ret; - - if (copy_from_user(&cr, uarg, sizeof(cr))) - return -EFAULT; - if (cr.value > 1) - return -EINVAL; - file = mps_get_file(cr.fd, &info); - if (IS_ERR(file)) - return PTR_ERR(file); - ret = mps_range(info, cr.offset, cr.len, &start, &end); - if (!ret) - mps_set_present(info, start, end, cr.value); - fput(file); - return ret; -} - static long mps_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -223,8 +201,6 @@ static long mps_ctl_ioctl(struct file *file, unsigned int cmd, switch (cmd) { case MPS_NEW_FILE: return mps_ctl_new_file(uarg); - case MPS_CTL_SET_PRESENT: - return mps_ctl_set_present(uarg); default: return -ENOTTY; } diff --git a/samples/kvm/mem_provider_sample.h b/samples/kvm/mem_provider_sample.h index c4cb10b4aadeb..b9f10286cb30e 100644 --- a/samples/kvm/mem_provider_sample.h +++ b/samples/kvm/mem_provider_sample.h @@ -30,25 +30,25 @@ struct mps_new_file { /* ioctl on a provider fd: read the file's state, for tests. */ struct mps_stats { __u64 size; - __u64 absent_pages; /* pages taken away by CTL_SET_PRESENT */ + __u64 absent_pages; /* pages taken away by MPS_SET_PRESENT */ }; #define MPS_GET_STATS \ _IOR(MPS_IOCTL_BASE, 10, struct mps_stats) /* - * ioctl on /dev/mem_provider_sample: CTL_SET_PRESENT on file @fd, by the - * owner. @value is the present value (1 = present, 0 = absent), and @offset + * ioctl on a provider fd: SET_PRESENT on [@offset, @offset + @len). + * @value is the present value (1 = present, 0 = absent), and @offset * and @len are a byte range within the file, page aligned. */ -struct mps_ctl_range { - __s32 fd; +struct mps_set_present { __u32 value; + __u32 pad; __u64 offset; /* bytes into the file, page aligned */ __u64 len; /* bytes, page aligned */ }; -#define MPS_CTL_SET_PRESENT \ - _IOW(MPS_IOCTL_BASE, 12, struct mps_ctl_range) +#define MPS_SET_PRESENT \ + _IOW(MPS_IOCTL_BASE, 12, struct mps_set_present) #endif /* _SAMPLES_KVM_MEM_PROVIDER_SAMPLE_H */ -- 2.56.0.257.gf7497c7d27-goog