From patchwork Mon May 30 08:28:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 627643 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 3rJ8sX6Syhz9sCk for ; Mon, 30 May 2016 18:28:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbcE3I2q (ORCPT ); Mon, 30 May 2016 04:28:46 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:49841 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932141AbcE3I2p (ORCPT ); Mon, 30 May 2016 04:28:45 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by norbury.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1b7IYs-0003RJ-0o; Mon, 30 May 2016 18:28:34 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1b7IYo-0001Ly-FH; Mon, 30 May 2016 16:28:30 +0800 Date: Mon, 30 May 2016 16:28:28 +0800 From: Herbert Xu To: Lennert Buytenhek Cc: Patrick McHardy , netdev@vger.kernel.org, Jiri Pirko Subject: [PATCH 2/2] macvlan: Avoid unnecessary multicast cloning Message-ID: <20160530082828.GB5106@gondor.apana.org.au> References: <20160526234433.GU8402@wantstofly.org> <20160530081752.GA4956@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160530081752.GA4956@gondor.apana.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently we always queue a multicast packet for further processing, even if none of the macvlan devices are subscribed to the address. This patch optimises this by adding a global multicast filter for a macvlan_port. Note that this patch doesn't handle the broadcast addresses of the individual macvlan devices correctly, if they are not all identical. However, this is already broken because there is no mechanism in place to update the individual multicast filters when you change the broadcast address. If someone cares enough they should fix this by collecting all broadcast addresses for a macvlan as we do for multicast and unicast. Signed-off-by: Herbert Xu diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index f55fe21..9fa4532 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -49,6 +49,7 @@ struct macvlan_port { bool passthru; int count; struct hlist_head vlan_source_hash[MACVLAN_HASH_SIZE]; + DECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ); }; struct macvlan_source_entry { @@ -418,6 +419,8 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) port = macvlan_port_get_rcu(skb->dev); if (is_multicast_ether_addr(eth->h_dest)) { + unsigned int hash; + skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN); if (!skb) return RX_HANDLER_CONSUMED; @@ -435,7 +438,9 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) goto out; } - macvlan_broadcast_enqueue(port, src, skb); + hash = mc_hash(NULL, eth->h_dest); + if (test_bit(hash, port->mc_filter)) + macvlan_broadcast_enqueue(port, src, skb); return RX_HANDLER_PASS; } @@ -725,6 +730,8 @@ static void macvlan_set_mac_lists(struct net_device *dev) { struct macvlan_dev *vlan = netdev_priv(dev); + dev_uc_sync(vlan->lowerdev, dev); + dev_mc_sync(vlan->lowerdev, dev); if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { bitmap_fill(vlan->mc_filter, MACVLAN_MC_FILTER_SZ); } else { @@ -739,9 +746,31 @@ static void macvlan_set_mac_lists(struct net_device *dev) __set_bit(mc_hash(vlan, dev->broadcast), filter); bitmap_copy(vlan->mc_filter, filter, MACVLAN_MC_FILTER_SZ); + + /* This is slightly inaccurate as we're including + * the subscription list of vlan->lowerdev too. + */ + bitmap_zero(filter, MACVLAN_MC_FILTER_SZ); + netdev_for_each_mc_addr(ha, vlan->lowerdev) { + __set_bit(mc_hash(NULL, ha->addr), filter); + } + + /* Bug alert: This only works if everyone has the + * same broadcast address. As soon as someone + * changes theirs this will break. + * + * However, this is already broken as when you + * change your broadcast address we don't get + * called. + * + * The solution is to maintain a list of broadcast + * addresses like we do for uc/mc, if you care. + */ + __set_bit(mc_hash(NULL, dev->broadcast), filter); + + bitmap_copy(vlan->port->mc_filter, filter, + MACVLAN_MC_FILTER_SZ); } - dev_uc_sync(vlan->lowerdev, dev); - dev_mc_sync(vlan->lowerdev, dev); } static int macvlan_change_mtu(struct net_device *dev, int new_mtu)