| Message ID | aa6d6a67-6889-338a-a910-51e889f792d5@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e11423d6721dd63b23fb41ade5e8d0b448b17780 |
| Headers | show |
| Series | xen/privcmd: misc corrections | expand |
On 9/22/21 6:17 AM, Jan Beulich wrote: > @@ -817,7 +818,7 @@ static long privcmd_ioctl_mmap_resource( > unsigned int i; > > for (i = 0; i < num; i++) { > - rc = pfns[i]; > + rc = errs[i]; > if (rc < 0) > break; Can the assignment be moved inside the 'if' statement? I am also not sure I understand why we need error array at all. Don't we always look at the first error only? In fact, AFAICS this is the only place where we look at the value. -boris
On 22.09.2021 15:29, Boris Ostrovsky wrote: > On 9/22/21 6:17 AM, Jan Beulich wrote: >> @@ -817,7 +818,7 @@ static long privcmd_ioctl_mmap_resource( >> unsigned int i; >> >> for (i = 0; i < num; i++) { >> - rc = pfns[i]; >> + rc = errs[i]; >> if (rc < 0) >> break; > > > Can the assignment be moved inside the 'if' statement? I wouldn't mind, albeit it's not the purpose of this change. Plus generally, when I do such elsewhere, I'm frequently told to better leave things as separate statements. IOW I'm a little surprised by the request. > I am also not sure I understand why we need error array at all. Don't we always look at the first error only? In fact, AFAICS this is the only place where we look at the value. Well, to look at the first error we need to scan the array to find one. Indeed we bail from here in once we've found a slot which has failed. I guess what you're trying to say is that there's room for improvement. In which case I might agree, but would want to point out that doing so would mean removing flexibility from the underlying function(s) (which may or may not be fine depending on what existing and future requirements there are). And that would be for another day, if at all. Jan
On 9/22/21 9:39 AM, Jan Beulich wrote: > On 22.09.2021 15:29, Boris Ostrovsky wrote: >> On 9/22/21 6:17 AM, Jan Beulich wrote: >>> @@ -817,7 +818,7 @@ static long privcmd_ioctl_mmap_resource( >>> unsigned int i; >>> >>> for (i = 0; i < num; i++) { >>> - rc = pfns[i]; >>> + rc = errs[i]; >>> if (rc < 0) >>> break; >> >> Can the assignment be moved inside the 'if' statement? > I wouldn't mind, albeit it's not the purpose of this change. Plus > generally, when I do such elsewhere, I'm frequently told to better > leave things as separate statements. IOW I'm a little surprised by > the request. Sure, can be done as a separate patch. Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > >> I am also not sure I understand why we need error array at all. Don't we always look at the first error only? In fact, AFAICS this is the only place where we look at the value. > Well, to look at the first error we need to scan the array to find > one. Indeed we bail from here in once we've found a slot which has > failed. > > I guess what you're trying to say is that there's room for > improvement. In which case I might agree, but would want to point > out that doing so would mean removing flexibility from the > underlying function(s) (which may or may not be fine depending on > what existing and future requirements there are). We haven't needed this for a while and IMO existing code, with overloading the meaning of the pfn array, is rather confusing, unnecessarily complicated and error-prone (thus your patch). > And that would > be for another day, if at all. True.
--- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -803,11 +803,12 @@ static long privcmd_ioctl_mmap_resource( unsigned int domid = (xdata.flags & XENMEM_rsrc_acq_caller_owned) ? DOMID_SELF : kdata.dom; - int num; + int num, *errs = (int *)pfns; + BUILD_BUG_ON(sizeof(*errs) > sizeof(*pfns)); num = xen_remap_domain_mfn_array(vma, kdata.addr & PAGE_MASK, - pfns, kdata.num, (int *)pfns, + pfns, kdata.num, errs, vma->vm_page_prot, domid, vma->vm_private_data); @@ -817,7 +818,7 @@ static long privcmd_ioctl_mmap_resource( unsigned int i; for (i = 0; i < num; i++) { - rc = pfns[i]; + rc = errs[i]; if (rc < 0) break; }
xen_pfn_t is the same size as int only on 32-bit builds (and not even on Arm32). Hence pfns[] can't be used directly to read individual error values returned from xen_remap_domain_mfn_array(); every other error indicator would be skipped/ignored on 64-bit. Fixes: 3ad0876554ca ("xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE") Cc: stable@vger.kernel.org Signed-off-by: Jan Beulich <jbeulich@suse.com>