lkml.org 
[lkml]   [2005]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[04/11] [SHAPER] fix Shaper driver lossage in 2.6.12
    -stable review patch.  If anyone has any objections, please let us know.

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

    [SHAPER]: Switch to spinlocks.

    Dave, you were right and the sleeping locks in shaper were
    broken. Markus Kanet noticed this and also tested the patch below that
    switches locking to spinlocks.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/net/shaper.c | 42 ++++++++++++++++--------------------------
    include/linux/if_shaper.h | 2 +-
    2 files changed, 17 insertions(+), 27 deletions(-)

    --- linux-2.6.12.2.orig/drivers/net/shaper.c 2005-06-17 12:48:29.000000000 -0700
    +++ linux-2.6.12.2/drivers/net/shaper.c 2005-07-13 10:56:34.000000000 -0700
    @@ -135,10 +135,8 @@
    {
    struct shaper *shaper = dev->priv;
    struct sk_buff *ptr;
    -
    - if (down_trylock(&shaper->sem))
    - return -1;
    -
    +
    + spin_lock(&shaper->lock);
    ptr=shaper->sendq.prev;

    /*
    @@ -232,7 +230,7 @@
    shaper->stats.collisions++;
    }
    shaper_kick(shaper);
    - up(&shaper->sem);
    + spin_unlock(&shaper->lock);
    return 0;
    }

    @@ -271,11 +269,9 @@
    {
    struct shaper *shaper = (struct shaper *)data;

    - if (!down_trylock(&shaper->sem)) {
    - shaper_kick(shaper);
    - up(&shaper->sem);
    - } else
    - mod_timer(&shaper->timer, jiffies);
    + spin_lock(&shaper->lock);
    + shaper_kick(shaper);
    + spin_unlock(&shaper->lock);
    }

    /*
    @@ -332,21 +328,6 @@


    /*
    - * Flush the shaper queues on a closedown
    - */
    -
    -static void shaper_flush(struct shaper *shaper)
    -{
    - struct sk_buff *skb;
    -
    - down(&shaper->sem);
    - while((skb=skb_dequeue(&shaper->sendq))!=NULL)
    - dev_kfree_skb(skb);
    - shaper_kick(shaper);
    - up(&shaper->sem);
    -}
    -
    -/*
    * Bring the interface up. We just disallow this until a
    * bind.
    */
    @@ -375,7 +356,15 @@
    static int shaper_close(struct net_device *dev)
    {
    struct shaper *shaper=dev->priv;
    - shaper_flush(shaper);
    + struct sk_buff *skb;
    +
    + while ((skb = skb_dequeue(&shaper->sendq)) != NULL)
    + dev_kfree_skb(skb);
    +
    + spin_lock_bh(&shaper->lock);
    + shaper_kick(shaper);
    + spin_unlock_bh(&shaper->lock);
    +
    del_timer_sync(&shaper->timer);
    return 0;
    }
    @@ -576,6 +565,7 @@
    init_timer(&sh->timer);
    sh->timer.function=shaper_timer;
    sh->timer.data=(unsigned long)sh;
    + spin_lock_init(&sh->lock);
    }

    /*
    --- linux-2.6.12.2.orig/include/linux/if_shaper.h 2005-06-17 12:48:29.000000000 -0700
    +++ linux-2.6.12.2/include/linux/if_shaper.h 2005-07-13 10:56:34.000000000 -0700
    @@ -23,7 +23,7 @@
    __u32 shapeclock;
    unsigned long recovery; /* Time we can next clock a packet out on
    an empty queue */
    - struct semaphore sem;
    + spinlock_t lock;
    struct net_device_stats stats;
    struct net_device *dev;
    int (*hard_start_xmit) (struct sk_buff *skb,
    -
    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-07-14 00:01    [W:0.026 / U:29.608 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site