From patchwork Wed Dec 15 08:48:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 75633 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 806AC1007D1 for ; Wed, 15 Dec 2010 19:52:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751213Ab0LOIwY (ORCPT ); Wed, 15 Dec 2010 03:52:24 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:45231 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868Ab0LOIwX (ORCPT ); Wed, 15 Dec 2010 03:52:23 -0500 Received: by iwn9 with SMTP id 9so1792875iwn.19 for ; Wed, 15 Dec 2010 00:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=08jZhISb2G2BXKZCcUmkeRDpEESy18/GL/wWQtd4Hd8=; b=WFtGcXyu2tvwSQ8+0dMF3hOgg0ZLtsLArfb8+4wiZwOib3dOoMelypskP84EX1PBNZ JQPLu5MTma1v5Jh1uivZmTaVzUvpU8gCxA2R+pRz6gM6lCu8IWEgS5R+wbvwoLOg6kph sX3CDaYGIo+t7he/uBnYVlvxJf/1OoTgF6OqA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=rOX0VhcDMGlWPPZBbedNBc0WeP9g/dwmJt8VP6FXzMRQ4q+zaiu/DkdiSF/FRi1sla 4ESUYWeOJC1vk92nCFKHrSserf2ZIAWNzDkbujW+URrSImvpIHgEqZdN8bqQagU2eX2c xacVLGxkJLi01f4wr/jWCjGwGUOwMPT9uJ32I= Received: by 10.231.208.5 with SMTP id ga5mr2719112ibb.163.1292403142872; Wed, 15 Dec 2010 00:52:22 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id 8sm772549iba.4.2010.12.15.00.52.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Dec 2010 00:52:21 -0800 (PST) From: Changli Gao To: Jamal Hadi Salim Cc: "David S. Miller" , Stephen Hemminger , Eric Dumazet , Tom Herbert , Jiri Pirko , netdev@vger.kernel.org, netem@lists.linux-foundation.org, Changli Gao Subject: [PATCH 5/5 v3] net: add old_queue_mapping into skb->cb Date: Wed, 15 Dec 2010 16:48:41 +0800 Message-Id: <1292402921-19644-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For the skbs returned from ifb, we should use the queue_mapping saved before ifb. We save old queue_mapping in old_queue_mapping just before calling dev_queue_xmit, and restore the old_queue_mapping to queue_mapping just before reinjecting the skb. dev_pick_tx() use the current queue_mapping for the skbs reinjected by ifb. A new struct dev_skb_cb is added, and valid in qdisc and gso layer. The original qdisc_skb_cb and DEV_GSO_CB use dev_skb_cb as the first member. netem_skb_cb is changed to contain qdisc_skb_cb. Signed-off-by: Changli Gao --- v3: use the method from Eric to allocate memory from skb->cb. Thank him. v2: save old_queue_mapping in skb->cb drivers/net/ifb.c | 1 + include/linux/netdevice.h | 10 ++++++++++ include/net/sch_generic.h | 3 ++- net/core/dev.c | 21 ++++++++++++++++----- net/sched/act_mirred.c | 1 + net/sched/sch_netem.c | 8 ++++---- 6 files changed, 34 insertions(+), 10 deletions(-) -- 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 diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 918a38e..ff01795 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -92,6 +92,7 @@ static void ri_tasklet(unsigned long arg) u64_stats_update_end(&qp->syncp); skb->skb_iif = dev->ifindex; + skb->queue_mapping = dev_skb_cb(skb)->old_queue_mapping; if (from & AT_EGRESS) { dev_queue_xmit(skb); } else if (from & AT_INGRESS) { diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d31bc3c..6f128e3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1295,6 +1295,16 @@ struct napi_gro_cb { #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) +struct dev_skb_cb { + u16 old_queue_mapping; +}; + +static inline struct dev_skb_cb *dev_skb_cb(struct sk_buff *skb) +{ + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct dev_skb_cb)); + return (struct dev_skb_cb *)skb->cb; +} + struct packet_type { __be16 type; /* This is really htons(ether_type). */ struct net_device *dev; /* NULL is wildcarded here */ diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index ea1f8a8..52c32e3 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -198,8 +198,8 @@ struct tcf_proto { }; struct qdisc_skb_cb { + struct dev_skb_cb dev_cb; /* must be the first */ unsigned int pkt_len; - char data[]; }; static inline int qdisc_qlen(struct Qdisc *q) @@ -209,6 +209,7 @@ static inline int qdisc_qlen(struct Qdisc *q) static inline struct qdisc_skb_cb *qdisc_skb_cb(struct sk_buff *skb) { + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct qdisc_skb_cb)); return (struct qdisc_skb_cb *)skb->cb; } diff --git a/net/core/dev.c b/net/core/dev.c index d28b3a0..2b8f863 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1901,10 +1901,15 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) } struct dev_gso_cb { - void (*destructor)(struct sk_buff *skb); + struct dev_skb_cb dev_cb; /* must be the first */ + void (*destructor)(struct sk_buff *skb); }; -#define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb) +static inline struct dev_gso_cb *dev_gso_cb(struct sk_buff *skb) +{ + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct dev_gso_cb)); + return (struct dev_gso_cb *)skb->cb; +} static void dev_gso_skb_destructor(struct sk_buff *skb) { @@ -1918,7 +1923,7 @@ static void dev_gso_skb_destructor(struct sk_buff *skb) kfree_skb(nskb); } while (skb->next); - cb = DEV_GSO_CB(skb); + cb = dev_gso_cb(skb); if (cb->destructor) cb->destructor(skb); } @@ -1947,7 +1952,7 @@ static int dev_gso_segment(struct sk_buff *skb) return PTR_ERR(segs); skb->next = segs; - DEV_GSO_CB(skb)->destructor = skb->destructor; + dev_gso_cb(skb)->destructor = skb->destructor; skb->destructor = dev_gso_skb_destructor; return 0; @@ -2103,7 +2108,7 @@ gso: out_kfree_gso_skb: if (likely(skb->next == NULL)) - skb->destructor = DEV_GSO_CB(skb)->destructor; + skb->destructor = dev_gso_cb(skb)->destructor; out_kfree_skb: kfree_skb(skb); out: @@ -2190,6 +2195,12 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, int queue_index; const struct net_device_ops *ops = dev->netdev_ops; +#ifdef CONFIG_NET_CLS_ACT + if (skb->tc_verd & TC_NCLS) { + queue_index = skb_get_queue_mapping(skb); + queue_index = dev_cap_txqueue(dev, queue_index); + } else +#endif if (dev->real_num_tx_queues == 1) queue_index = 0; else if (ops->ndo_select_queue) { diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 0c311be..419e82f 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -197,6 +197,7 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a, skb2->skb_iif = skb->dev->ifindex; skb2->dev = dev; + dev_skb_cb(skb2)->old_queue_mapping = skb->queue_mapping; dev_queue_xmit(skb2); err = 0; diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index e5593c0..c2cf72f 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -77,14 +77,14 @@ struct netem_sched_data { /* Time stamp put into socket buffer control block */ struct netem_skb_cb { - psched_time_t time_to_send; + struct qdisc_skb_cb qdisc_cb; /* must be the first */ + psched_time_t time_to_send; }; static inline struct netem_skb_cb *netem_skb_cb(struct sk_buff *skb) { - BUILD_BUG_ON(sizeof(skb->cb) < - sizeof(struct qdisc_skb_cb) + sizeof(struct netem_skb_cb)); - return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data; + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct netem_skb_cb)); + return (struct netem_skb_cb *)skb->cb; } /* init_crandom - initialize correlated random number generator