[PATCH net-2.6] net_sched: always clone skbs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Changli Gao
Date: Monday, December 20, 2010 - 7:35 am

Pawel reported a panic related to handling shared skbs in ixgbe
incorrectly. So we need to revert my previous patch to work around
this bug. Instead of reverting the patch completely, I just revert
the essential lines, so we can add the previous optimization
back more easily in future.

    commit 3511c9132f8b1e1b5634e41a3331c44b0c13be70
    Author: Changli Gao <xiaosuo@gmail.com>
    Date:   Sat Oct 16 13:04:08 2010 +0000
    
        net_sched: remove the unused parameter of qdisc_create_dflt()

Reported-by: Pawel Staszewski <pstaszewski@itcare.pl>
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
---
 include/net/sch_generic.h |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 786cc39..0af57eb 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -611,11 +611,7 @@ static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
 {
 	struct sk_buff *n;
 
-	if ((action == TC_ACT_STOLEN || action == TC_ACT_QUEUED) &&
-	    !skb_shared(skb))
-		n = skb_get(skb);
-	else
-		n = skb_clone(skb, gfp_mask);
+	n = skb_clone(skb, gfp_mask);
 
 	if (n) {
 		n->tc_verd = SET_TC_VERD(n->tc_verd, 0);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH net-2.6] net_sched: always clone skbs, Changli Gao, (Mon Dec 20, 7:35 am)
Re: [PATCH net-2.6] net_sched: always clone skbs, Eric Dumazet, (Mon Dec 20, 7:37 am)
Re: [PATCH net-2.6] net_sched: always clone skbs, David Miller, (Mon Dec 20, 11:27 am)
Re: [PATCH net-2.6] net_sched: always clone skbs, Jarek Poplawski, (Mon Dec 20, 4:20 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, Eric Dumazet, (Mon Dec 20, 4:28 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, Jarek Poplawski, (Mon Dec 20, 4:52 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, Changli Gao, (Mon Dec 20, 5:21 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, David Miller, (Mon Dec 20, 8:55 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, Changli Gao, (Tue Dec 21, 7:17 am)
Re: [PATCH net-2.6] net_sched: always clone skbs, Jarek Poplawski, (Tue Dec 21, 3:37 pm)
Re: [PATCH net-2.6] net_sched: always clone skbs, Jarek Poplawski, (Thu Dec 23, 4:04 pm)
[RFC] net_sched: mark packet staying on queue too long, Eric Dumazet, (Sun Jan 2, 2:27 pm)
Re: [RFC] net_sched: mark packet staying on queue too long, Stephen Hemminger, (Mon Jan 3, 10:58 am)
[PATCH] sch_red: report backlog information, Eric Dumazet, (Mon Jan 3, 11:11 am)
Re: [PATCH] sch_red: report backlog information, David Miller, (Mon Jan 3, 1:13 pm)
Re: [RFC] net_sched: mark packet staying on queue too long, Jesper Dangaard Brouer, (Tue Jan 4, 7:19 am)
Re: [RFC] net_sched: mark packet staying on queue too long, Stephen Hemminger, (Tue Jan 4, 9:05 am)