lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 81/83] aio: clean up aio ring in the fail path
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gu Zheng <guz.fnst@cn.fujitsu.com>

    commit d1b9432712a25eeb06114fb4b587133525a47de5 upstream.

    Clean up the aio ring file in the fail path of aio_setup_ring
    and ioctx_alloc. And maybe it can fix the GPF issue reported by
    Dave Jones:
    https://lkml.org/lkml/2013/11/25/898

    Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
    Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/aio.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/fs/aio.c
    +++ b/fs/aio.c
    @@ -367,8 +367,10 @@ static int aio_setup_ring(struct kioctx
    if (nr_pages > AIO_RING_PAGES) {
    ctx->ring_pages = kcalloc(nr_pages, sizeof(struct page *),
    GFP_KERNEL);
    - if (!ctx->ring_pages)
    + if (!ctx->ring_pages) {
    + put_aio_ring_file(ctx);
    return -ENOMEM;
    + }
    }

    ctx->mmap_size = nr_pages * PAGE_SIZE;
    @@ -645,7 +647,7 @@ static struct kioctx *ioctx_alloc(unsign
    aio_nr + nr_events < aio_nr) {
    spin_unlock(&aio_nr_lock);
    err = -EAGAIN;
    - goto err;
    + goto err_ctx;
    }
    aio_nr += ctx->max_reqs;
    spin_unlock(&aio_nr_lock);
    @@ -662,6 +664,8 @@ static struct kioctx *ioctx_alloc(unsign

    err_cleanup:
    aio_nr_sub(ctx->max_reqs);
    +err_ctx:
    + aio_free_ring(ctx);
    err:
    free_percpu(ctx->cpu);
    free_percpu(ctx->reqs.pcpu_count);



    \
     
     \ /
      Last update: 2013-12-06 23:41    [W:4.046 / U:0.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site