lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 20/21] memblock: memblock_alloc_try_nid: don't panic
    Date
    As all the memblock_alloc*() users are now checking the return value and
    panic() in case of error, the panic() call can be removed from the core
    memblock allocator, namely memblock_alloc_try_nid().

    Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
    ---
    mm/memblock.c | 15 +++++----------
    1 file changed, 5 insertions(+), 10 deletions(-)

    diff --git a/mm/memblock.c b/mm/memblock.c
    index 03b3929..7164275 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -1526,7 +1526,7 @@ void * __init memblock_alloc_try_nid_nopanic(
    }

    /**
    - * memblock_alloc_try_nid - allocate boot memory block with panicking
    + * memblock_alloc_try_nid - allocate boot memory block
    * @size: size of memory block to be allocated in bytes
    * @align: alignment of the region and block's size
    * @min_addr: the lower bound of the memory region from where the allocation
    @@ -1536,9 +1536,8 @@ void * __init memblock_alloc_try_nid_nopanic(
    * allocate only from memory limited by memblock.current_limit value
    * @nid: nid of the free area to find, %NUMA_NO_NODE for any node
    *
    - * Public panicking version of memblock_alloc_try_nid_nopanic()
    - * which provides debug information (including caller info), if enabled,
    - * and panics if the request can not be satisfied.
    + * Public function, provides additional debug information (including caller
    + * info), if enabled. This function zeroes the allocated memory.
    *
    * Return:
    * Virtual address of allocated memory block on success, NULL on failure.
    @@ -1555,14 +1554,10 @@ void * __init memblock_alloc_try_nid(
    &max_addr, (void *)_RET_IP_);
    ptr = memblock_alloc_internal(size, align,
    min_addr, max_addr, nid);
    - if (ptr) {
    + if (ptr)
    memset(ptr, 0, size);
    - return ptr;
    - }

    - panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
    - __func__, (u64)size, (u64)align, nid, &min_addr, &max_addr);
    - return NULL;
    + return ptr;
    }

    /**
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-01-21 09:07    [W:4.340 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site