From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jan Kiszka <jan.kiszka@web.de>,
Jason Wessel <jason.wessel@windriver.com>,
Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org, Joerg Roedel <joro@8bytes.org>,
Ralf Baechle <ralf@linux-mips.org>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Kyungmin Park <kyungmin.park@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Arnd Bergmann <arnd@arndb.de>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
linux-mips@linux-mips.org, xen-devel@lists.xensource.com,
virtualization@lists.linux-foundation.org,
Shuah Khan <shuahkhan@gmail.com>
Subject: Re: [PATCH 35/35] x86: Don't panic if can not alloc buffer for swiotlb
Date: Fri, 25 Jan 2013 11:47:49 -0500 [thread overview]
Message-ID: <20130125164749.GB27244@phenom.dumpdata.com> (raw)
In-Reply-To: <1359058816-7615-36-git-send-email-yinghai@kernel.org>
On Thu, Jan 24, 2013 at 12:20:16PM -0800, Yinghai Lu wrote:
> Normal boot path on system with iommu support:
> swiotlb buffer will be allocated early at first and then try to initialize
> iommu, if iommu for intel or AMD could setup properly, swiotlb buffer
> will be freed.
>
> The early allocating is with bootmem, and could panic when we try to use
> kdump with buffer above 4G only, or with memmap to limit mem under 4G.
> for example: memmap=4095M$1M to remove memory under 4G.
>
> According to Eric, add _nopanic version and no_iotlb_memory to fail
> map single later if swiotlb is still needed.
>
> -v2: don't pass nopanic, and use -ENOMEM return value according to Eric.
> panic early instead of using swiotlb_full to panic...according to Eric/Konrad.
> -v3: make swiotlb_init to be notpanic, but will affect:
> arm64, ia64, powerpc, tile, unicore32, x86.
> -v4: cleanup swiotlb_init by removing swiotlb_init_with_default_size.
>
> Suggested-by: Eric W. Biederman <ebiederm@xmission.com>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
:-)
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Jeremy Fitzhardinge <jeremy@goop.org>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Cc: linux-mips@linux-mips.org
> Cc: xen-devel@lists.xensource.com
> Cc: virtualization@lists.linux-foundation.org
> Cc: Shuah Khan <shuahkhan@gmail.com>
> ---
> arch/mips/cavium-octeon/dma-octeon.c | 3 ++-
> drivers/xen/swiotlb-xen.c | 4 ++-
> include/linux/swiotlb.h | 2 +-
> lib/swiotlb.c | 47 +++++++++++++++++++++-------------
> 4 files changed, 35 insertions(+), 21 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
> index 41dd0088..02f2444 100644
> --- a/arch/mips/cavium-octeon/dma-octeon.c
> +++ b/arch/mips/cavium-octeon/dma-octeon.c
> @@ -317,7 +317,8 @@ void __init plat_swiotlb_setup(void)
>
> octeon_swiotlb = alloc_bootmem_low_pages(swiotlbsize);
>
> - swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1);
> + if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)
> + panic("Cannot allocate SWIOTLB buffer");
>
> mips_dma_map_ops = &octeon_linear_dma_map_ops.dma_map_ops;
> }
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index af47e75..1d94316 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -231,7 +231,9 @@ retry:
> }
> start_dma_addr = xen_virt_to_bus(xen_io_tlb_start);
> if (early) {
> - swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose);
> + if (swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs,
> + verbose))
> + panic("Cannot allocate SWIOTLB buffer");
> rc = 0;
> } else
> rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs);
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 071d62c..2de42f9 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -23,7 +23,7 @@ extern int swiotlb_force;
> #define IO_TLB_SHIFT 11
>
> extern void swiotlb_init(int verbose);
> -extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
> +int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
> extern unsigned long swiotlb_nr_tbl(void);
> extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
>
> diff --git a/lib/swiotlb.c b/lib/swiotlb.c
> index 196b069..bfe02b8 100644
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -122,11 +122,18 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
> return phys_to_dma(hwdev, virt_to_phys(address));
> }
>
> +static bool no_iotlb_memory;
> +
> void swiotlb_print_info(void)
> {
> unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
> unsigned char *vstart, *vend;
>
> + if (no_iotlb_memory) {
> + pr_warn("software IO TLB: No low mem\n");
> + return;
> + }
> +
> vstart = phys_to_virt(io_tlb_start);
> vend = phys_to_virt(io_tlb_end);
>
> @@ -136,7 +143,7 @@ void swiotlb_print_info(void)
> bytes >> 20, vstart, vend - 1);
> }
>
> -void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
> +int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
> {
> void *v_overflow_buffer;
> unsigned long i, bytes;
> @@ -150,9 +157,10 @@ void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
> /*
> * Get the overflow emergency buffer
> */
> - v_overflow_buffer = alloc_bootmem_low_pages(PAGE_ALIGN(io_tlb_overflow));
> + v_overflow_buffer = alloc_bootmem_low_pages_nopanic(
> + PAGE_ALIGN(io_tlb_overflow));
> if (!v_overflow_buffer)
> - panic("Cannot allocate SWIOTLB overflow buffer!\n");
> + return -ENOMEM;
>
> io_tlb_overflow_buffer = __pa(v_overflow_buffer);
>
> @@ -169,15 +177,19 @@ void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
>
> if (verbose)
> swiotlb_print_info();
> +
> + return 0;
> }
>
> /*
> * Statically reserve bounce buffer space and initialize bounce buffer data
> * structures for the software IO TLB used to implement the DMA API.
> */
> -static void __init
> -swiotlb_init_with_default_size(size_t default_size, int verbose)
> +void __init
> +swiotlb_init(int verbose)
> {
> + /* default to 64MB */
> + size_t default_size = 64UL<<20;
> unsigned char *vstart;
> unsigned long bytes;
>
> @@ -188,20 +200,16 @@ swiotlb_init_with_default_size(size_t default_size, int verbose)
>
> bytes = io_tlb_nslabs << IO_TLB_SHIFT;
>
> - /*
> - * Get IO TLB memory from the low pages
> - */
> - vstart = alloc_bootmem_low_pages(PAGE_ALIGN(bytes));
> - if (!vstart)
> - panic("Cannot allocate SWIOTLB buffer");
> -
> - swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose);
> -}
> + /* Get IO TLB memory from the low pages */
> + vstart = alloc_bootmem_low_pages_nopanic(PAGE_ALIGN(bytes));
> + if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose))
> + return;
>
> -void __init
> -swiotlb_init(int verbose)
> -{
> - swiotlb_init_with_default_size(64 * (1<<20), verbose); /* default to 64MB */
> + if (io_tlb_start)
> + free_bootmem(io_tlb_start,
> + PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
> + pr_warn("Cannot allocate SWIOTLB buffer");
> + no_iotlb_memory = true;
> }
>
> /*
> @@ -405,6 +413,9 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
> unsigned long offset_slots;
> unsigned long max_slots;
>
> + if (no_iotlb_memory)
> + panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");
> +
> mask = dma_get_seg_boundary(hwdev);
>
> tbl_dma_addr &= mask;
> --
> 1.7.10.4
>
next prev parent reply other threads:[~2013-01-25 16:48 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 20:19 [PATCH 00/35] x86, boot, 64bit: Add support for loading ramdisk and bzImage above 4G Yinghai Lu
2013-01-24 20:19 ` [PATCH 01/35] x86, mm: Fix page table early allocation offset checking Yinghai Lu
2013-01-30 1:20 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 02/35] x86: Handle multiple exactmaps and out of order exactmap Yinghai Lu
2013-01-24 20:19 ` [PATCH 03/35] x86, mm: Introduce memmap=reserveram Yinghai Lu
2013-01-24 20:19 ` [PATCH 04/35] x86: Clean up e820 add kernel range Yinghai Lu
2013-01-24 23:21 ` Jacob Shin
2013-01-30 1:21 ` [tip:x86/mm2] x86: Factor out e820_add_kernel_range() tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 05/35] x86, 64bit, mm: Make pgd next calculation consistent with pud/pmd Yinghai Lu
2013-01-30 1:22 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 06/35] x86, realmode: Set real_mode permissions early Yinghai Lu
2013-01-30 1:23 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 07/35] x86, 64bit, mm: Add generic kernel/ident mapping helper Yinghai Lu
2013-01-30 1:24 ` [tip:x86/mm2] x86, 64bit, mm: Add generic kernel/ ident " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 08/35] x86, 64bit: Copy zero-page early Yinghai Lu
2013-01-30 1:25 ` [tip:x86/mm2] x86, 64bit: Copy struct boot_params early tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 09/35] x86, 64bit, realmode: Use init_level4_pgt to set trapmoline_pgd directly Yinghai Lu
2013-01-30 1:27 ` [tip:x86/mm2] x86, 64bit, realmode: Use init_level4_pgt to set trampoline_pgd directly tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 10/35] x86, realmode: Separate real_mode reserve and setup Yinghai Lu
2013-01-30 1:28 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 11/35] x86, 64bit: early #PF handler set page table Yinghai Lu
2013-01-30 1:29 ` [tip:x86/mm2] x86, 64bit: Use a #PF handler to materialize early mappings on demand tip-bot for H. Peter Anvin
2013-01-24 20:19 ` [PATCH 12/35] x86, 64bit: #PF handler set page to cover only 2M per #PF Yinghai Lu
2013-01-30 1:30 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 13/35] x86, 64bit: Don't set max_pfn_mapped wrong value early on native path Yinghai Lu
2013-01-30 1:31 ` [tip:x86/mm2] x86, 64bit: Don' t " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 14/35] x86: Merge early_reserve_initrd for 32bit and 64bit Yinghai Lu
2013-01-30 1:32 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 15/35] x86: Add get_ramdisk_image/size() Yinghai Lu
2013-01-30 1:34 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 16/35] x86, boot: Add get_cmd_line_ptr() Yinghai Lu
2013-01-30 1:35 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 17/35] x86, boot: Move checking of cmd_line_ptr out of common path Yinghai Lu
2013-01-30 1:36 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:19 ` [PATCH 18/35] x86, boot: Pass cmd_line_ptr with unsigned long instead Yinghai Lu
2013-01-30 1:37 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 19/35] x86, boot: Move verify_cpu.S and no_longmode down Yinghai Lu
2013-01-30 1:38 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 20/35] x86, boot: Move lldt/ltr out of 64bit code section Yinghai Lu
2013-01-30 1:39 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 21/35] x86, kexec: Remove 1024G limitation for kexec buffer on 64bit Yinghai Lu
2013-01-30 1:40 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 22/35] x86, kexec: Set ident mapping for kernel that is above max_pfn Yinghai Lu
2013-01-30 1:42 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 23/35] x86, kexec: Replace ident_mapping_init and init_level4_page Yinghai Lu
2013-01-30 1:43 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 24/35] x86, kexec, 64bit: Only set ident mapping for ram Yinghai Lu
2013-01-30 1:44 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 25/35] x86, boot: Add fields to support load bzImage and ramdisk above 4G Yinghai Lu
2013-01-28 0:07 ` [tip:x86/boot] x86, boot: Define the 2.12 bzImage boot protocol tip-bot for H. Peter Anvin
2013-01-29 9:48 ` [tip:x86/boot] x86, boot: Sanitize boot_params if not zeroed on creation tip-bot for H. Peter Anvin
2013-01-30 1:45 ` [tip:x86/mm2] x86, boot: enable support load bzImage and ramdisk above 4G tip-bot for Yinghai Lu
2013-01-30 1:54 ` Yinghai Lu
2013-01-30 2:18 ` H. Peter Anvin
2013-01-30 3:47 ` [tip:x86/mm2] x86, boot: Support loading bzImage, boot_params " tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 26/35] x86, boot: Update comments about entries for 64bit image Yinghai Lu
2013-01-30 1:46 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:48 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 27/35] x86, boot: Not need to check setup_header version for setup_data Yinghai Lu
2013-01-30 1:47 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:49 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 28/35] memblock: Add memblock_mem_size() Yinghai Lu
2013-01-30 1:49 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:50 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 29/35] x86, kdump: Remove crashkernel range find limit for 64bit Yinghai Lu
2013-01-30 1:50 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:51 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 30/35] x86: Add Crash kernel low reservation Yinghai Lu
2013-01-30 1:51 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-02-07 5:14 ` Rob Landley
2013-02-07 6:39 ` Yinghai Lu
2013-01-30 3:52 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 31/35] x86: Merge early kernel reserve for 32bit and 64bit Yinghai Lu
2013-01-30 1:52 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:53 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 32/35] x86, 64bit, mm: Mark data/bss/brk to nx Yinghai Lu
2013-01-30 1:53 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:55 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 33/35] x86, 64bit, mm: hibernate use generic mapping_init Yinghai Lu
2013-01-24 22:50 ` Rafael J. Wysocki
2013-01-30 1:54 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:56 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 34/35] mm: Add alloc_bootmem_low_pages_nopanic() Yinghai Lu
2013-01-30 1:56 ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2013-01-30 3:57 ` tip-bot for Yinghai Lu
2013-01-24 20:20 ` [PATCH 35/35] x86: Don't panic if can not alloc buffer for swiotlb Yinghai Lu
2013-01-25 16:47 ` Konrad Rzeszutek Wilk [this message]
2013-01-30 1:57 ` [tip:x86/mm2] x86: Don' t " tip-bot for Yinghai Lu
2013-01-30 3:58 ` tip-bot for Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130125164749.GB27244@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=andrzej.p@samsung.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=jan.kiszka@web.de \
--cc=jason.wessel@windriver.com \
--cc=jeremy@goop.org \
--cc=joro@8bytes.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=m.szyprowski@samsung.com \
--cc=mingo@elte.hu \
--cc=ralf@linux-mips.org \
--cc=shuahkhan@gmail.com \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xensource.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).