act_mirred: don't clone skb when skb isn't shared
don't clone skb when skb isn't shared When the tcf_action is TC_ACT_STOLEN, and the skb isn't shared, we don't need to clone a new skb. As the skb will be freed after this function returns, we can use it freely once we get a reference to it. Signed-off-by: Changli Gao <xiaosuo@gmail.com> ---- include/net/sch_generic.h | 11 +++++++++-- net/sched/act_mirred.c | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c4ead4c595
commit
210d6de78c
|
@ -594,9 +594,16 @@ static inline u32 qdisc_l2t(struct qdisc_rate_table* rtab, unsigned int pktlen)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_NET_CLS_ACT
|
#ifdef CONFIG_NET_CLS_ACT
|
||||||
static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask)
|
static inline struct sk_buff *skb_act_clone(struct sk_buff *skb, gfp_t gfp_mask,
|
||||||
|
int action)
|
||||||
{
|
{
|
||||||
struct sk_buff *n = skb_clone(skb, 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);
|
||||||
|
|
||||||
if (n) {
|
if (n) {
|
||||||
n->tc_verd = SET_TC_VERD(n->tc_verd, 0);
|
n->tc_verd = SET_TC_VERD(n->tc_verd, 0);
|
||||||
|
|
|
@ -169,13 +169,13 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
skb2 = skb_act_clone(skb, GFP_ATOMIC);
|
at = G_TC_AT(skb->tc_verd);
|
||||||
|
skb2 = skb_act_clone(skb, GFP_ATOMIC, m->tcf_action);
|
||||||
if (skb2 == NULL)
|
if (skb2 == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
m->tcf_bstats.bytes += qdisc_pkt_len(skb2);
|
m->tcf_bstats.bytes += qdisc_pkt_len(skb2);
|
||||||
m->tcf_bstats.packets++;
|
m->tcf_bstats.packets++;
|
||||||
at = G_TC_AT(skb->tc_verd);
|
|
||||||
if (!(at & AT_EGRESS)) {
|
if (!(at & AT_EGRESS)) {
|
||||||
if (m->tcfm_ok_push)
|
if (m->tcfm_ok_push)
|
||||||
skb_push(skb2, skb2->dev->hard_header_len);
|
skb_push(skb2, skb2->dev->hard_header_len);
|
||||||
|
@ -185,8 +185,8 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
|
||||||
if (m->tcfm_eaction != TCA_EGRESS_MIRROR)
|
if (m->tcfm_eaction != TCA_EGRESS_MIRROR)
|
||||||
skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at);
|
skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at);
|
||||||
|
|
||||||
skb2->dev = dev;
|
|
||||||
skb2->skb_iif = skb->dev->ifindex;
|
skb2->skb_iif = skb->dev->ifindex;
|
||||||
|
skb2->dev = dev;
|
||||||
dev_queue_xmit(skb2);
|
dev_queue_xmit(skb2);
|
||||||
err = 0;
|
err = 0;
|
||||||
|
|
||||||
|
|
Reference in New Issue