xen/privcmd: allow fetching resource sizes
Subsystems (2)
PATCH 1/1 xen/privcmd: allow fetching resource sizes
commit ef3a575baf53571dc405ee4028e26f50856898e7 upstream
Allow issuing an IOCTL_PRIVCMD_MMAP_RESOURCE ioctl with num = 0 and addr = 0 in order to fetch the size of a specific resource.
Add a shortcut to the default map resource path, since fetching the size requires no address to be passed in, and thus no VMA to setup.
This is missing from the initial implementation, and causes issues when mapping resources that don't have fixed or known sizes.
---
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]
--- drivers/xen/privcmd.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/xen/privcmd.c +19 -6
@@ -743,14 +743,15 @@ static int remap_pfn_fn(pte_t *ptep, pgtable_t token, unsigned long addr,return 0 ; } -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) +static long privcmd_ioctl_mmap_resource (struct file *file, +struct privcmd_mmap_resource __user *udata) {struct privcmd_data *data = file->private_data;struct mm_struct *mm = current->mm;struct vm_area_struct *vma;struct privcmd_mmap_resource kdata;xen_pfn_t *pfns =NULL ; -struct xen_mem_acquire_resource xdata; +struct xen_mem_acquire_resource xdata = { };int rc;if (copy_from_user (&kdata, udata,sizeof (kdata)))
@@ -760,6 +761,22 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)if (data->domid !=DOMID_INVALID && data->domid != kdata.dom)return -EPERM ; +/* Both fields must be set or unset */ +if (!!kdata.addr != !!kdata.num) +return -EINVAL ; + + xdata.domid = kdata.dom; + xdata.type = kdata.type; + xdata.id = kdata.id; + +if (!kdata.addr && !kdata.num) { +/* Query the size of the resource. */ + rc =HYPERVISOR_memory_op (XENMEM_acquire_resource, &xdata); +if (rc) +return rc; +return __put_user (xdata.nr_frames, &udata->num); + } +down_write (&mm->mmap_sem); vma =find_vma (mm, kdata.addr);
@@ -793,10 +810,6 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) }else vma->vm_private_data =PRIV_VMA_LOCKED ; -memset (&xdata,0 ,sizeof (xdata)); - xdata.domid = kdata.dom; - xdata.type = kdata.type; - xdata.id = kdata.id; xdata.frame = kdata.idx; xdata.nr_frames = kdata.num;set_xen_guest_handle (xdata.frame_list, pfns);
Signature · 1 line
2.29.2
Quoted 17 lines · Roger Pau Monne
commit
ef3a575baf53571dc405ee4028e26f50856898e7upstreamAllow issuing an
IOCTL_PRIVCMD_MMAP_RESOURCEioctl with num = 0 and addr = 0 in order to fetch the size of a specific resource.Add a shortcut to the default map resource path, since fetching the size requires no address to be passed in, and thus no VMA to setup.
This is missing from the initial implementation, and causes issues when mapping resources that don't have fixed or known sizes.
Signed-off-by Roger Pau Monné <[email protected]>Reviewed-by Juergen Gross <[email protected]>Tested-by Andrew Cooper <[email protected]>Cc [email protected] # >= 4.18Signed-off-by Juergen Gross <[email protected]>
Quoted 6 lines
---
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]--- drivers/xen/privcmd.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
Now queued up, thanks.
greg k-h
Quoted 24 lines · Greg KH
Quoted 17 lines · Roger Pau Monne
commit
ef3a575baf53571dc405ee4028e26f50856898e7upstreamAllow issuing an
IOCTL_PRIVCMD_MMAP_RESOURCEioctl with num = 0 and addr = 0 in order to fetch the size of a specific resource.Add a shortcut to the default map resource path, since fetching the size requires no address to be passed in, and thus no VMA to setup.
This is missing from the initial implementation, and causes issues when mapping resources that don't have fixed or known sizes.
Signed-off-by Roger Pau Monné <[email protected]>Reviewed-by Juergen Gross <[email protected]>Tested-by Andrew Cooper <[email protected]>Cc [email protected] # >= 4.18Signed-off-by Juergen Gross <[email protected]>Quoted 6 lines
---
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]--- drivers/xen/privcmd.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
Quoted 1 line
Now queued up, thanks.
Hello,
The upstream version of this patch was queued against 5.4 and 4.19, both of which suffered a patch conflict, and are fixed by this version.
Was it an oversight that this version didn't get queued for 4.19?
Thanks,
~Andrew
Quoted 25 lines · Andrew Cooper
Quoted 24 lines · Greg KH
Quoted 23 lines · Roger Pau Monne
commit
ef3a575baf53571dc405ee4028e26f50856898e7upstreamAllow issuing an
IOCTL_PRIVCMD_MMAP_RESOURCEioctl with num = 0 and addr = 0 in order to fetch the size of a specific resource.Add a shortcut to the default map resource path, since fetching the size requires no address to be passed in, and thus no VMA to setup.
This is missing from the initial implementation, and causes issues when mapping resources that don't have fixed or known sizes.
Signed-off-by Roger Pau Monné <[email protected]>Reviewed-by Juergen Gross <[email protected]>Tested-by Andrew Cooper <[email protected]>Cc [email protected] # >= 4.18Signed-off-by Juergen Gross <[email protected]>---
Cc: Boris Ostrovsky <[email protected]>
Cc: [email protected]--- drivers/xen/privcmd.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
Quoted 8 lines
Quoted 1 line
Now queued up, thanks.
Hello,
The upstream version of this patch was queued against 5.4 and 4.19, both of which suffered a patch conflict, and are fixed by this version.
Was it an oversight that this version didn't get queued for 4.19?
It does not apply cleanly there, if you provide a working backport, I will be glad to apply it.
thanks,
greg k-h
PATCH 1/1 xen/privcmd: allow fetching resource sizes
commit ef3a575baf53571dc405ee4028e26f50856898e7 upstream.
Allow issuing an IOCTL_PRIVCMD_MMAP_RESOURCE ioctl with num = 0 and addr = 0 in order to fetch the size of a specific resource.
Add a shortcut to the default map resource path, since fetching the size requires no address to be passed in, and thus no VMA to setup.
This is missing from the initial implementation, and causes issues when mapping resources that don't have fixed or known sizes.
--- drivers/xen/privcmd.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/xen/privcmd.c +19 -6
@@ -743,14 +743,15 @@ static int remap_pfn_fn(pte_t *ptep, pgtable_t token, unsigned long addr,return 0 ; } -static long privcmd_ioctl_mmap_resource (struct file *file,void __user *udata) +static long privcmd_ioctl_mmap_resource (struct file *file, +struct privcmd_mmap_resource __user *udata) {struct privcmd_data *data = file->private_data;struct mm_struct *mm = current->mm;struct vm_area_struct *vma;struct privcmd_mmap_resource kdata;xen_pfn_t *pfns =NULL ; -struct xen_mem_acquire_resource xdata; +struct xen_mem_acquire_resource xdata = { };int rc;if (copy_from_user (&kdata, udata,sizeof (kdata)))
@@ -760,6 +761,22 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)if (data->domid !=DOMID_INVALID && data->domid != kdata.dom)return -EPERM ; +/* Both fields must be set or unset */ +if (!!kdata.addr != !!kdata.num) +return -EINVAL ; + + xdata.domid = kdata.dom; + xdata.type = kdata.type; + xdata.id = kdata.id; + +if (!kdata.addr && !kdata.num) { +/* Query the size of the resource. */ + rc =HYPERVISOR_memory_op (XENMEM_acquire_resource, &xdata); +if (rc) +return rc; +return __put_user (xdata.nr_frames, &udata->num); + } +down_write (&mm->mmap_sem); vma =find_vma (mm, kdata.addr);
@@ -793,10 +810,6 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata) }else vma->vm_private_data =PRIV_VMA_LOCKED ; -memset (&xdata,0 ,sizeof (xdata)); - xdata.domid = kdata.dom; - xdata.type = kdata.type; - xdata.id = kdata.id; xdata.frame = kdata.idx; xdata.nr_frames = kdata.num;set_xen_guest_handle (xdata.frame_list, pfns);
Signature · 1 line
2.29.2
Greg Kroah-Hartman
maintainerQuoted 2 lines · Roger Pau Monne
commit
ef3a575baf53571dc405ee4028e26f50856898e7upstream.
Now queued up, thanks.
greg k-h