From patchwork Mon Jul 16 01:12:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 944116 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="0dAwAhVk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41TQQ45Xrsz9ryt for ; Mon, 16 Jul 2018 11:13:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727260AbeGPBho (ORCPT ); Sun, 15 Jul 2018 21:37:44 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36357 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727142AbeGPBho (ORCPT ); Sun, 15 Jul 2018 21:37:44 -0400 Received: by mail-pf0-f196.google.com with SMTP id d14-v6so1697883pfo.3 for ; Sun, 15 Jul 2018 18:12:50 -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=AuMeMCeusWT2sH8JcYhXJPLBD+X11jL304P3ianJbK0=; b=0dAwAhVkZvlHol2yBMDx4Cxn0e4F55fNfO7GWxGalmMzzfqHQTUMqaj3SyPa2zxgs3 AaqtVf8oCav2tRSBwJEYMz7J/kjqP+4V75nGUeU0/3+fS44Ei3hT4mebU3BgJ5o4O/NN tlCtmU2cM8xHBGGylAF9htXvmglKU2Od8Z80BG4QeX85qXW45dVYHpO/dNBNZkEqwEny 061Y0/lf8xajMsf46tXyHOlItr+hLSnXD4Z7Hj2tjyOovm8UA4/isHx9L4AZ1dOY8ydl Mk95hPnauewOdwIk0wYw8L3+xqYGPVVuJNRgjLqXvd9i39HrcoV3Qowf10NV9Np6rwfZ HN2Q== 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=AuMeMCeusWT2sH8JcYhXJPLBD+X11jL304P3ianJbK0=; b=JogscfwFUza/bm/VF9eAkLt+DbtSF74714wdqblur223pb5NUefCZnRnYSGDSsDfPw qVswBYd4shKh1Al4mq0Fc3L6PXbGr4RtLr5rEszGkUanjH8ZG2HcxJiEKaPo2N8UYR9e nQ0cD20GwuOmdV0AcJ6HU57H/np7jkPLqq4zgsf3zryGFUGwKLyW4Bs/36m3oIvHlecH qpwv82FyLrIimetQmmcJS4LqKEsNjR8sbrLWo17qjvHjk95rkQo+wTgfBBjrnsSifuxq cMWI22lRt0WzOQquWJJUxCHUJb/eSBD64qvRAv8Db020lBWsOlst8/yNuJwwoh55UfUc EDrg== X-Gm-Message-State: AOUpUlHs3l06mY2FUlh5EYzhR824CWkCrWxwuDxxiq0Aq0O9gdU1tRKp X7TfDMpihsrv/zXyg1XHhf9f0Q== X-Google-Smtp-Source: AAOMgpeIgO7A3/0w92thEOq32oQQzgv84KA6XggsH1DfoYHKJ5TqgoY+mPUguqugIjhBsC53gsnUqw== X-Received: by 2002:a62:c819:: with SMTP id z25-v6mr15795862pff.44.1531703570047; Sun, 15 Jul 2018 18:12:50 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:c7f9:6225:a527:f3a4]) by smtp.gmail.com with ESMTPSA id t78-v6sm54329804pfa.160.2018.07.15.18.12.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 15 Jul 2018 18:12:49 -0700 (PDT) From: Mahesh Bandewar To: Jay Vosburgh , Andy Gospodarek , Veaceslav Falico , David Miller Cc: Netdev , Michal Soltys , Mahesh Bandewar , Mahesh Bandewar Subject: [PATCH next] bonding: pass link-local packets to bonding master also. Date: Sun, 15 Jul 2018 18:12:46 -0700 Message-Id: <20180716011246.225647-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. Reported-by: Michal Soltys Signed-off-by: Mahesh Bandewar --- 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;