[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAF6-1L5hKU-VM0E5vCwExJ4kb8YB=ndotgfH7pbpxO6Q7+JHUQ@mail.gmail.com>
Date: Wed, 12 Sep 2012 13:53:44 +0200
From: Sylvain Munaut <s.munaut@...tever-company.com>
To: Eric Dumazet <eric.dumazet@...il.com>
Cc: netdev@...r.kernel.org, Cong Wang <amwang@...hat.com>
Subject: Re: NULL deref in bnx2 / crashes ? ( was: netconsole leads to stalled
CPU task )
Hi Eric,
AFAICT, the following patch was never merged but I just confirmed that
I do need it over 3.6-rc5 for things to work properly.
>> > diff --git a/net/core/netpoll.c b/net/core/netpoll.c
>> > index 346b1eb..df731a0 100644
>> > --- a/net/core/netpoll.c
>> > +++ b/net/core/netpoll.c
>> > @@ -335,8 +335,11 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
>> > /* don't get messages out of order, and no recursion */
>> > if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
>> > struct netdev_queue *txq;
>> > + int queue_index = skb_get_queue_mapping(skb);
>> >
>> > - txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
>> > + if (queue_index >= dev->real_num_tx_queues)
>> > + queue_index = 0;
>> > + txq = netdev_get_tx_queue(dev, queue_index);
>> >
>> > /* try until next clock tick */
>> > for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
>>
>>
>> Well, it doesn't solve the problem :(
>>
>> It does have an effect though. Now even on the machine with the
>> broadcom card, it just freeze the machine ...
>> On the machine with intel card, it actually does get a couple of
>> netconsole packet out and then freeze as well.
>>
>
> my patch was incomplete, sorry :
>
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 346b1eb..ddc453b 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -335,8 +335,13 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
> /* don't get messages out of order, and no recursion */
> if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
> struct netdev_queue *txq;
> + int queue_index = skb_get_queue_mapping(skb);
>
> - txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
> + if (queue_index >= dev->real_num_tx_queues) {
> + queue_index = 0;
> + skb_set_queue_mapping(skb, 0);
> + }
> + txq = netdev_get_tx_queue(dev, queue_index);
>
> /* try until next clock tick */
> for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
Cheers,
Sylvain
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists