Commit ba35f858 authored by Mahesh Bandewar's avatar Mahesh Bandewar Committed by David S. Miller

ipvlan: Defer multicast / broadcast processing to a work-queue

Processing multicast / broadcast in fast path is performance draining
and having more links means more cloning and bringing performance
down further.

Broadcast; in particular, need to be given to all the virtual links.
Earlier tricks of enabling broadcast bit for IPv4 only interfaces are not
really working since it fails autoconf. Which means enabling broadcast
for all the links if protocol specific hacks do not have to be added into
the driver.

This patch defers all (incoming as well as outgoing) multicast traffic to
a work-queue leaving only the unicast traffic in the fast-path. Now if we
need to apply any additional tricks to further reduce the impact of this
(multicast / broadcast) type of traffic, it can be implemented while
processing this work without affecting the fast-path.
Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76061d99
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#define IPVLAN_MAC_FILTER_SIZE (1 << IPVLAN_MAC_FILTER_BITS) #define IPVLAN_MAC_FILTER_SIZE (1 << IPVLAN_MAC_FILTER_BITS)
#define IPVLAN_MAC_FILTER_MASK (IPVLAN_MAC_FILTER_SIZE - 1) #define IPVLAN_MAC_FILTER_MASK (IPVLAN_MAC_FILTER_SIZE - 1)
#define IPVLAN_QBACKLOG_LIMIT 1000
typedef enum { typedef enum {
IPVL_IPV6 = 0, IPVL_IPV6 = 0,
IPVL_ICMPV6, IPVL_ICMPV6,
...@@ -93,6 +95,8 @@ struct ipvl_port { ...@@ -93,6 +95,8 @@ struct ipvl_port {
struct hlist_head hlhead[IPVLAN_HASH_SIZE]; struct hlist_head hlhead[IPVLAN_HASH_SIZE];
struct list_head ipvlans; struct list_head ipvlans;
struct rcu_head rcu; struct rcu_head rcu;
struct work_struct wq;
struct sk_buff_head backlog;
int count; int count;
u16 mode; u16 mode;
}; };
...@@ -112,6 +116,7 @@ void ipvlan_set_port_mode(struct ipvl_port *port, u32 nval); ...@@ -112,6 +116,7 @@ void ipvlan_set_port_mode(struct ipvl_port *port, u32 nval);
void ipvlan_init_secret(void); void ipvlan_init_secret(void);
unsigned int ipvlan_mac_hash(const unsigned char *addr); unsigned int ipvlan_mac_hash(const unsigned char *addr);
rx_handler_result_t ipvlan_handle_frame(struct sk_buff **pskb); rx_handler_result_t ipvlan_handle_frame(struct sk_buff **pskb);
void ipvlan_process_multicast(struct work_struct *work);
int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev); int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev);
void ipvlan_ht_addr_add(struct ipvl_dev *ipvlan, struct ipvl_addr *addr); void ipvlan_ht_addr_add(struct ipvl_dev *ipvlan, struct ipvl_addr *addr);
struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan, struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan,
......
...@@ -189,62 +189,69 @@ unsigned int ipvlan_mac_hash(const unsigned char *addr) ...@@ -189,62 +189,69 @@ unsigned int ipvlan_mac_hash(const unsigned char *addr)
return hash & IPVLAN_MAC_FILTER_MASK; return hash & IPVLAN_MAC_FILTER_MASK;
} }
static void ipvlan_multicast_frame(struct ipvl_port *port, struct sk_buff *skb, void ipvlan_process_multicast(struct work_struct *work)
const struct ipvl_dev *in_dev, bool local)
{ {
struct ethhdr *eth = eth_hdr(skb); struct ipvl_port *port = container_of(work, struct ipvl_port, wq);
struct ethhdr *ethh;
struct ipvl_dev *ipvlan; struct ipvl_dev *ipvlan;
struct sk_buff *nskb; struct sk_buff *skb, *nskb;
struct sk_buff_head list;
unsigned int len; unsigned int len;
unsigned int mac_hash; unsigned int mac_hash;
int ret; int ret;
u8 pkt_type;
bool hlocal, dlocal;
if (skb->protocol == htons(ETH_P_PAUSE)) __skb_queue_head_init(&list);
return;
rcu_read_lock();
list_for_each_entry_rcu(ipvlan, &port->ipvlans, pnode) {
if (local && (ipvlan == in_dev))
continue;
mac_hash = ipvlan_mac_hash(eth->h_dest); spin_lock_bh(&port->backlog.lock);
if (!test_bit(mac_hash, ipvlan->mac_filters)) skb_queue_splice_tail_init(&port->backlog, &list);
continue; spin_unlock_bh(&port->backlog.lock);
ret = NET_RX_DROP; while ((skb = __skb_dequeue(&list)) != NULL) {
len = skb->len + ETH_HLEN; ethh = eth_hdr(skb);
nskb = skb_clone(skb, GFP_ATOMIC); hlocal = ether_addr_equal(ethh->h_source, port->dev->dev_addr);
if (!nskb) mac_hash = ipvlan_mac_hash(ethh->h_dest);
goto mcast_acct;
if (ether_addr_equal(eth->h_dest, ipvlan->phy_dev->broadcast)) if (ether_addr_equal(ethh->h_dest, port->dev->broadcast))
nskb->pkt_type = PACKET_BROADCAST; pkt_type = PACKET_BROADCAST;
else else
nskb->pkt_type = PACKET_MULTICAST; pkt_type = PACKET_MULTICAST;
nskb->dev = ipvlan->dev; dlocal = false;
if (local) rcu_read_lock();
ret = dev_forward_skb(ipvlan->dev, nskb); list_for_each_entry_rcu(ipvlan, &port->ipvlans, pnode) {
else if (hlocal && (ipvlan->dev == skb->dev)) {
ret = netif_rx(nskb); dlocal = true;
mcast_acct: continue;
ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true); }
} if (!test_bit(mac_hash, ipvlan->mac_filters))
rcu_read_unlock(); continue;
/* Locally generated? ...Forward a copy to the main-device as ret = NET_RX_DROP;
* well. On the RX side we'll ignore it (wont give it to any len = skb->len + ETH_HLEN;
* of the virtual devices. nskb = skb_clone(skb, GFP_ATOMIC);
*/ if (!nskb)
if (local) { goto acct;
nskb = skb_clone(skb, GFP_ATOMIC);
if (nskb) { nskb->pkt_type = pkt_type;
if (ether_addr_equal(eth->h_dest, port->dev->broadcast)) nskb->dev = ipvlan->dev;
nskb->pkt_type = PACKET_BROADCAST; if (hlocal)
ret = dev_forward_skb(ipvlan->dev, nskb);
else else
nskb->pkt_type = PACKET_MULTICAST; ret = netif_rx(nskb);
acct:
dev_forward_skb(port->dev, nskb); ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
}
rcu_read_unlock();
if (dlocal) {
/* If the packet originated here, send it out. */
skb->dev = port->dev;
skb->pkt_type = pkt_type;
dev_queue_xmit(skb);
} else {
kfree_skb(skb);
} }
} }
} }
...@@ -446,6 +453,26 @@ static int ipvlan_process_outbound(struct sk_buff *skb, ...@@ -446,6 +453,26 @@ static int ipvlan_process_outbound(struct sk_buff *skb,
return ret; return ret;
} }
static void ipvlan_multicast_enqueue(struct ipvl_port *port,
struct sk_buff *skb)
{
if (skb->protocol == htons(ETH_P_PAUSE)) {
kfree_skb(skb);
return;
}
spin_lock(&port->backlog.lock);
if (skb_queue_len(&port->backlog) < IPVLAN_QBACKLOG_LIMIT) {
__skb_queue_tail(&port->backlog, skb);
spin_unlock(&port->backlog.lock);
schedule_work(&port->wq);
} else {
spin_unlock(&port->backlog.lock);
atomic_long_inc(&skb->dev->rx_dropped);
kfree_skb(skb);
}
}
static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev) static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)
{ {
const struct ipvl_dev *ipvlan = netdev_priv(dev); const struct ipvl_dev *ipvlan = netdev_priv(dev);
...@@ -493,11 +520,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev) ...@@ -493,11 +520,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
return dev_forward_skb(ipvlan->phy_dev, skb); return dev_forward_skb(ipvlan->phy_dev, skb);
} else if (is_multicast_ether_addr(eth->h_dest)) { } else if (is_multicast_ether_addr(eth->h_dest)) {
u8 ip_summed = skb->ip_summed; ipvlan_multicast_enqueue(ipvlan->port, skb);
return NET_XMIT_SUCCESS;
skb->ip_summed = CHECKSUM_UNNECESSARY;
ipvlan_multicast_frame(ipvlan->port, skb, ipvlan, true);
skb->ip_summed = ip_summed;
} }
skb->dev = ipvlan->phy_dev; skb->dev = ipvlan->phy_dev;
...@@ -581,8 +605,18 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb, ...@@ -581,8 +605,18 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb,
int addr_type; int addr_type;
if (is_multicast_ether_addr(eth->h_dest)) { if (is_multicast_ether_addr(eth->h_dest)) {
if (ipvlan_external_frame(skb, port)) if (ipvlan_external_frame(skb, port)) {
ipvlan_multicast_frame(port, skb, NULL, false); struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
/* External frames are queued for device local
* distribution, but a copy is given to master
* straight away to avoid sending duplicates later
* when work-queue processes this frame. This is
* achieved by returning RX_HANDLER_PASS.
*/
if (nskb)
ipvlan_multicast_enqueue(port, nskb);
}
} else { } else {
struct ipvl_addr *addr; struct ipvl_addr *addr;
......
...@@ -54,6 +54,9 @@ static int ipvlan_port_create(struct net_device *dev) ...@@ -54,6 +54,9 @@ static int ipvlan_port_create(struct net_device *dev)
for (idx = 0; idx < IPVLAN_HASH_SIZE; idx++) for (idx = 0; idx < IPVLAN_HASH_SIZE; idx++)
INIT_HLIST_HEAD(&port->hlhead[idx]); INIT_HLIST_HEAD(&port->hlhead[idx]);
skb_queue_head_init(&port->backlog);
INIT_WORK(&port->wq, ipvlan_process_multicast);
err = netdev_rx_handler_register(dev, ipvlan_handle_frame, port); err = netdev_rx_handler_register(dev, ipvlan_handle_frame, port);
if (err) if (err)
goto err; goto err;
...@@ -72,6 +75,8 @@ static void ipvlan_port_destroy(struct net_device *dev) ...@@ -72,6 +75,8 @@ static void ipvlan_port_destroy(struct net_device *dev)
dev->priv_flags &= ~IFF_IPVLAN_MASTER; dev->priv_flags &= ~IFF_IPVLAN_MASTER;
netdev_rx_handler_unregister(dev); netdev_rx_handler_unregister(dev);
cancel_work_sync(&port->wq);
__skb_queue_purge(&port->backlog);
kfree_rcu(port, rcu); kfree_rcu(port, rcu);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment