* [PATCH] pkt_sched: Fix dev_graft_qdisc() locking
@ 2008-08-25 22:48 Jarek Poplawski
2008-08-26 12:48 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: Jarek Poplawski @ 2008-08-25 22:48 UTC (permalink / raw)
To: David Miller; +Cc: netdev
pkt_sched: Fix dev_graft_qdisc() locking
During dev_graft_qdisc() dev is deactivated, so qdisc_root_lock()
returns wrong lock of noop_qdisc instead of qdisc_sleeping.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
net/sched/sch_api.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 4f9397f..85e078c 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -624,7 +624,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
struct Qdisc *oqdisc = dev_queue->qdisc_sleeping;
spinlock_t *root_lock;
- root_lock = qdisc_root_lock(oqdisc);
+ root_lock = qdisc_lock(oqdisc);
spin_lock_bh(root_lock);
/* Prune old scheduler */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] pkt_sched: Fix dev_graft_qdisc() locking
2008-08-25 22:48 [PATCH] pkt_sched: Fix dev_graft_qdisc() locking Jarek Poplawski
@ 2008-08-26 12:48 ` Herbert Xu
2008-08-26 13:05 ` Jarek Poplawski
2008-08-27 9:15 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Herbert Xu @ 2008-08-26 12:48 UTC (permalink / raw)
To: Jarek Poplawski; +Cc: davem, netdev
Jarek Poplawski <jarkao2@gmail.com> wrote:
> pkt_sched: Fix dev_graft_qdisc() locking
>
> During dev_graft_qdisc() dev is deactivated, so qdisc_root_lock()
> returns wrong lock of noop_qdisc instead of qdisc_sleeping.
>
>
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Looks good to me!
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] pkt_sched: Fix dev_graft_qdisc() locking
2008-08-26 12:48 ` Herbert Xu
@ 2008-08-26 13:05 ` Jarek Poplawski
2008-08-27 9:15 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Jarek Poplawski @ 2008-08-26 13:05 UTC (permalink / raw)
To: Herbert Xu; +Cc: davem, netdev
On Tue, Aug 26, 2008 at 10:48:13PM +1000, Herbert Xu wrote:
> Jarek Poplawski <jarkao2@gmail.com> wrote:
> > pkt_sched: Fix dev_graft_qdisc() locking
> >
> > During dev_graft_qdisc() dev is deactivated, so qdisc_root_lock()
> > returns wrong lock of noop_qdisc instead of qdisc_sleeping.
> >
> >
> > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
>
> Looks good to me!
>
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
>
BTW, I should've probably mention this lock doesn't probably
matter here much, after current precise deactivation.
Thanks,
Jarek P.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pkt_sched: Fix dev_graft_qdisc() locking
2008-08-26 12:48 ` Herbert Xu
2008-08-26 13:05 ` Jarek Poplawski
@ 2008-08-27 9:15 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2008-08-27 9:15 UTC (permalink / raw)
To: herbert; +Cc: jarkao2, netdev
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 26 Aug 2008 22:48:13 +1000
> Jarek Poplawski <jarkao2@gmail.com> wrote:
> > pkt_sched: Fix dev_graft_qdisc() locking
> >
> > During dev_graft_qdisc() dev is deactivated, so qdisc_root_lock()
> > returns wrong lock of noop_qdisc instead of qdisc_sleeping.
> >
> >
> > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
>
> Looks good to me!
>
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-08-27 9:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-25 22:48 [PATCH] pkt_sched: Fix dev_graft_qdisc() locking Jarek Poplawski
2008-08-26 12:48 ` Herbert Xu
2008-08-26 13:05 ` Jarek Poplawski
2008-08-27 9:15 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.