| Message ID | 56477481-87da-4962-9661-5e1b277efde0@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | swiotlb-xen: fixes and adjustments | expand |
On Tue, Sep 07, 2021 at 02:05:54PM +0200, Jan Beulich wrote: > Only on the 2nd of the paths leading to xen_swiotlb_init()'s "error" > label it is useful to retry the allocation; the first one did already > iterate through all possible order values. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
On Tue, 7 Sep 2021, Jan Beulich wrote: > Only on the 2nd of the paths leading to xen_swiotlb_init()'s "error" > label it is useful to retry the allocation; the first one did already > iterate through all possible order values. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > I'm not convinced of the (lack of) indentation of the label, but I made > the new one matzch the existing one. > > --- a/drivers/xen/swiotlb-xen.c > +++ b/drivers/xen/swiotlb-xen.c > @@ -184,7 +184,7 @@ retry: > order--; > } > if (!start) > - goto error; > + goto exit; > if (order != get_order(bytes)) { > pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n", > (PAGE_SIZE << order) >> 20); > @@ -214,6 +214,7 @@ error: > pr_info("Lowering to %luMB\n", bytes >> 20); > goto retry; > } > +exit: > pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); > return rc; > } >
--- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -184,7 +184,7 @@ retry: order--; } if (!start) - goto error; + goto exit; if (order != get_order(bytes)) { pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n", (PAGE_SIZE << order) >> 20); @@ -214,6 +214,7 @@ error: pr_info("Lowering to %luMB\n", bytes >> 20); goto retry; } +exit: pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); return rc; }
Only on the 2nd of the paths leading to xen_swiotlb_init()'s "error" label it is useful to retry the allocation; the first one did already iterate through all possible order values. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- I'm not convinced of the (lack of) indentation of the label, but I made the new one matzch the existing one.