lkml.org 
[lkml]   [2005]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/10] Uml: use GFP_ATOMIC for allocations under spinlocks.
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    setup_initial_poll is only called with sigio_lock() held, so use appropriate
    allocation.

    Also, parse_chan() can also be called when holding a spinlock (see line_open()
    -> parse_chan_pair()).

    I have sporadical problems (spinlock taken twice, with spinlock debugging on
    UP) which could be caused by a sequence like "take spinlock, alloc and go to
    sleep, take again the spinlock in the other thread".

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---

    arch/um/drivers/chan_kern.c | 2 +-
    arch/um/kernel/sigio_user.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
    --- a/arch/um/drivers/chan_kern.c
    +++ b/arch/um/drivers/chan_kern.c
    @@ -465,7 +465,7 @@ static struct chan *parse_chan(char *str
    data = (*ops->init)(str, device, opts);
    if(data == NULL) return(NULL);

    - chan = kmalloc(sizeof(*chan), GFP_KERNEL);
    + chan = kmalloc(sizeof(*chan), GFP_ATOMIC);
    if(chan == NULL) return(NULL);
    *chan = ((struct chan) { .list = LIST_HEAD_INIT(chan->list),
    .primary = 1,
    diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
    --- a/arch/um/kernel/sigio_user.c
    +++ b/arch/um/kernel/sigio_user.c
    @@ -340,7 +340,7 @@ static int setup_initial_poll(int fd)
    {
    struct pollfd *p;

    - p = um_kmalloc(sizeof(struct pollfd));
    + p = um_kmalloc_atomic(sizeof(struct pollfd));
    if(p == NULL){
    printk("setup_initial_poll : failed to allocate poll\n");
    return(-1);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-09-21 19:54    [W:0.022 / U:0.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site