Skip to content

Commit 79ca5f7

Browse files
jbeulichjgross1
authored andcommitted
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: Jan Beulich <jbeulich@suse.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/56477481-87da-4962-9661-5e1b277efde0@suse.com Signed-off-by: Juergen Gross <jgross@suse.com>
1 parent d9a688a commit 79ca5f7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/xen/swiotlb-xen.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ int __ref xen_swiotlb_init(void)
184184
order--;
185185
}
186186
if (!start)
187-
goto error;
187+
goto exit;
188188
if (order != get_order(bytes)) {
189189
pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n",
190190
(PAGE_SIZE << order) >> 20);
@@ -214,6 +214,7 @@ int __ref xen_swiotlb_init(void)
214214
pr_info("Lowering to %luMB\n", bytes >> 20);
215215
goto retry;
216216
}
217+
exit:
217218
pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc);
218219
return rc;
219220
}

0 commit comments

Comments
 (0)