Commit 79ca5f77 authored by Jan Beulich's avatar Jan Beulich Committed by Juergen Gross

swiotlb-xen: suppress certain init retries

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: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/56477481-87da-4962-9661-5e1b277efde0@suse.comSigned-off-by: default avatarJuergen Gross <jgross@suse.com>
parent d9a688ad
...@@ -184,7 +184,7 @@ int __ref xen_swiotlb_init(void) ...@@ -184,7 +184,7 @@ int __ref xen_swiotlb_init(void)
order--; order--;
} }
if (!start) if (!start)
goto error; goto exit;
if (order != get_order(bytes)) { if (order != get_order(bytes)) {
pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n", pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n",
(PAGE_SIZE << order) >> 20); (PAGE_SIZE << order) >> 20);
...@@ -214,6 +214,7 @@ int __ref xen_swiotlb_init(void) ...@@ -214,6 +214,7 @@ int __ref xen_swiotlb_init(void)
pr_info("Lowering to %luMB\n", bytes >> 20); pr_info("Lowering to %luMB\n", bytes >> 20);
goto retry; goto retry;
} }
exit:
pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment