diff options
author | Eric Dumazet <edumazet@google.com> | 2014-10-05 21:38:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-07 13:22:11 -0400 |
commit | 0287587884b15041203b3a362d485e1ab1f24445 (patch) | |
tree | 675ae57663c1ba3ee8768e65e7fb0e6d0259e04c /drivers/net/wan | |
parent | fe971b95c22578456ff7198537827841c726d3f7 (diff) |
net: better IFF_XMIT_DST_RELEASE support
Testing xmit_more support with netperf and connected UDP sockets,
I found strange dst refcount false sharing.
Current handling of IFF_XMIT_DST_RELEASE is not optimal.
Dropping dst in validate_xmit_skb() is certainly too late in case
packet was queued by cpu X but dequeued by cpu Y
The logical point to take care of drop/force is in __dev_queue_xmit()
before even taking qdisc lock.
As Julian Anastasov pointed out, need for skb_dst() might come from some
packet schedulers or classifiers.
This patch adds new helper to cleanly express needs of various drivers
or qdiscs/classifiers.
Drivers that need skb_dst() in their ndo_start_xmit() should call
following helper in their setup instead of the prior :
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
->
netif_keep_dst(dev);
Instead of using a single bit, we use two bits, one being
eventually rebuilt in bonding/team drivers.
The other one, is permanent and blocks IFF_XMIT_DST_RELEASE being
rebuilt in bonding/team. Eventually, we could add something
smarter later.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/hdlc_fr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index e5c7e6165a4b..3ebed1c40abb 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
@@ -1047,7 +1047,7 @@ static void pvc_setup(struct net_device *dev) | |||
1047 | dev->flags = IFF_POINTOPOINT; | 1047 | dev->flags = IFF_POINTOPOINT; |
1048 | dev->hard_header_len = 10; | 1048 | dev->hard_header_len = 10; |
1049 | dev->addr_len = 2; | 1049 | dev->addr_len = 2; |
1050 | dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; | 1050 | netif_keep_dst(dev); |
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | static const struct net_device_ops pvc_ops = { | 1053 | static const struct net_device_ops pvc_ops = { |