From patchwork Wed Jul 18 23:41:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 945960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bandewar.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bandewar-net.20150623.gappssmtp.com header.i=@bandewar-net.20150623.gappssmtp.com header.b="HN6HMM7s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41WDDn4hsBz9s1R for ; Thu, 19 Jul 2018 09:41:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731058AbeGSAV1 (ORCPT ); Wed, 18 Jul 2018 20:21:27 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:45173 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728304AbeGSAV1 (ORCPT ); Wed, 18 Jul 2018 20:21:27 -0400 Received: by mail-pf0-f195.google.com with SMTP id i26-v6so2923547pfo.12 for ; Wed, 18 Jul 2018 16:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bandewar-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=401KfDTQwxLjL4foIKI/pgv08+GE2eOYlyT0EeoGd/Y=; b=HN6HMM7sqZWBrqIlaNjmjpsk3dtN2lc6uLaXtz6vAkCRluTO6An8ArgWOEGqWOgU42 IA4t+jZOmcgP6zKNHEtiqT/HCdswapmQe2RIv9PDn6vUxUQE4PFd1r9S+MKvRqyuvc29 L0lo0bcSCsPVhRNGvBL7Q4nGZSpyNa1xywDBuLlbrY6aMJnUPs9q43mQ80IdQE/59Bcg Tx8xdw49trFHrlh2mZmKk2ExwLnvHhHRA4YQcRo8DzRqV4HwGSICoDlhi5LVqRZNVpi4 54VrDQuQsJJ3wyyNjuzCmU2QH9uJG6d1axxQn+nZZWk3ylKoxovuL5m3On865VFd78SK rRng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=401KfDTQwxLjL4foIKI/pgv08+GE2eOYlyT0EeoGd/Y=; b=CHA0CiyvHt5aUEx4YnAhmeuoDaOrlt/nddkBKUY8QUH37mj8RgmFX7OWe07TIqOWyY pv77Kx92IZrd3jCmhQUY3+5ZMiTF6LGikPBGB5ZFSfPTTumx1LPo5ComjNV8fJGwO8D9 eih4bwF6CTECWuxffhskDK4s2j2OCZrDgjJUSGmP+ED7n3KhpUkfNW6BYH7qoPGUMzTD SZJPcFQAineRhScV+R8sG/s0P0x6ipTnI4ZPffFd8pu0pAl1FC3t8g8ADISzVx05/adl HeMvRhUXPnAJhy/2e2yRVkA65Zi/h/CiG1texMRpQjjPIXm3JXGefpV3VUukb/DviMHI YhLQ== X-Gm-Message-State: AOUpUlGUwcQir0J88InxpfDEEDIU6B1M8scTITmmA0erhsfTXM8fahoC KrWj8kUd+D+Vsm40j8y4csUiUw== X-Google-Smtp-Source: AAOMgpczoml39eSykvT138xwxBVvL5EGQnGeBeba99j1GewgT5WMdjxgtE/UcjPVEEsCv9yff3u/Nw== X-Received: by 2002:a62:c8c2:: with SMTP id i63-v6mr7169217pfk.73.1531957271296; Wed, 18 Jul 2018 16:41:11 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:c7f9:6225:a527:f3a4]) by smtp.gmail.com with ESMTPSA id x81-v6sm7048321pfk.52.2018.07.18.16.41.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 16:41:10 -0700 (PDT) From: Mahesh Bandewar To: Jay Vosburgh , Andy Gospodarek , Veaceslav Falico , David Miller Cc: Netdev , Michal Soltys , Mahesh Bandewar , Mahesh Bandewar Subject: [PATCH net v2] bonding: pass link-local packets to bonding master also. Date: Wed, 18 Jul 2018 16:41:06 -0700 Message-Id: <20180718234106.243196-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.18.0.203.gfac676dfb9-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mahesh Bandewar Commit b89f04c61efe ("bonding: deliver link-local packets with skb->dev set to link that packets arrived on") changed the behavior of how link-local-multicast packets are processed. The change in the behavior broke some legacy use cases where these packets are expected to arrive on bonding master device also. This patch passes the packet to the stack with the link it arrived on as well as passes to the bonding-master device to preserve the legacy use case. Fixes: b89f04c61efe ("bonding: deliver link-local packets with skb->dev set to link that packets arrived on") Reported-by: Michal Soltys Signed-off-by: Mahesh Bandewar --- v2: Added Fixes tag. v1: Initial patch. drivers/net/bonding/bond_main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9a2ea3c1f949..1d3b7d8448f2 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1177,9 +1177,22 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) } } - /* don't change skb->dev for link-local packets */ - if (is_link_local_ether_addr(eth_hdr(skb)->h_dest)) + /* Link-local multicast packets should be passed to the + * stack on the link they arrive as well as pass them to the + * bond-master device. These packets are mostly usable when + * stack receives it with the link on which they arrive + * (e.g. LLDP) but there may be some legacy behavior that + * expects these packets to appear on bonding master too. + */ + if (is_link_local_ether_addr(eth_hdr(skb)->h_dest)) { + struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC); + + if (nskb) { + nskb->dev = bond->dev; + netif_rx(nskb); + } return RX_HANDLER_PASS; + } if (bond_should_deliver_exact_match(skb, slave, bond)) return RX_HANDLER_EXACT;