lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 122/149] dm crypt: fix mempool deadlock
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mikulas Patocka <mpatocka@redhat.com>

    commit aeb2deae2660a1773c83d3c6e9e6575daa3855d6 upstream.

    This patch fixes a possible deadlock in dm-crypt's mempool use.

    Currently, dm-crypt reserves a mempool of MIN_BIO_PAGES reserved pages.
    It allocates first MIN_BIO_PAGES with non-failing allocation (the allocation
    cannot fail and waits until the mempool is refilled). Further pages are
    allocated with different gfp flags that allow failing.

    Because allocations may be done in parallel, this code can deadlock. Example:
    There are two processes, each tries to allocate MIN_BIO_PAGES and the processes
    run simultaneously.
    It may end up in a situation where each process allocates (MIN_BIO_PAGES / 2)
    pages. The mempool is exhausted. Each process waits for more pages to be freed
    to the mempool, which never happens.

    To avoid this deadlock scenario, this patch changes the code so that only
    the first page is allocated with non-failing gfp mask. Allocation of further
    pages may fail.

    Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
    Signed-off-by: Milan Broz <mbroz@redhat.com>
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/md/dm-crypt.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/drivers/md/dm-crypt.c
    +++ b/drivers/md/dm-crypt.c
    @@ -176,7 +176,6 @@ struct crypt_config {

    #define MIN_IOS 16
    #define MIN_POOL_PAGES 32
    -#define MIN_BIO_PAGES 8

    static struct kmem_cache *_crypt_io_pool;

    @@ -848,12 +847,11 @@ static struct bio *crypt_alloc_buffer(st
    }

    /*
    - * if additional pages cannot be allocated without waiting,
    - * return a partially allocated bio, the caller will then try
    - * to allocate additional bios while submitting this partial bio
    + * If additional pages cannot be allocated without waiting,
    + * return a partially-allocated bio. The caller will then try
    + * to allocate more bios while submitting this partial bio.
    */
    - if (i == (MIN_BIO_PAGES - 1))
    - gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
    + gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;

    len = (size > PAGE_SIZE) ? PAGE_SIZE : size;




    \
     
     \ /
      Last update: 2012-03-30 23:37    [W:4.239 / U:0.932 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site