From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87013C43381 for ; Mon, 25 Feb 2019 21:41:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 564F4213A2 for ; Mon, 25 Feb 2019 21:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130884; bh=vudtx12oHcq2Bp0tQq5lxNFVflGs+C9/eCjyPrrrM/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VojDSirgNZZeumFpE+cMYriVIQtzB9RLoDhUkZ7sLOE9UnFVsl2j6WO3NGUQI0zNk gPlUC06zhkZ26KoAxftEnh7zRW4imIR71FHNp1RgO0YHO5+0tACbNNnlGDqClvjd18 1K0RuLpjWrpWCP2euYXXyUqGl5vdYWdozu0YEBFw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732268AbfBYVdm (ORCPT ); Mon, 25 Feb 2019 16:33:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:39894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732244AbfBYVdk (ORCPT ); Mon, 25 Feb 2019 16:33:40 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FEF5217F5; Mon, 25 Feb 2019 21:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130419; bh=vudtx12oHcq2Bp0tQq5lxNFVflGs+C9/eCjyPrrrM/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AoAvFro0mi1OhX7y0p3RmlE8pBYx00qfvw9TH9PyH4SODBiVX/RV9E4gkmTnYvtpD 6h35S4AsAQSXemVSWn+sSgyS5yfIJIEVovhChV9dmVYiM+Epgg6KSHHqCeKL9oA7xK WCy5HjiL21kGKXRTxYGWutzOy4zaS29CP+mlYFKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Alexander Petrovskiy , Petr Machata , Roopa Prabhu , Nikolay Aleksandrov , bridge@lists.linux-foundation.org, "David S. Miller" , Sasha Levin Subject: [PATCH 4.20 116/183] net: bridge: Mark FDB entries that were added by user as such Date: Mon, 25 Feb 2019 22:11:29 +0100 Message-Id: <20190225195114.133478058@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 710ae72877378e7cde611efd30fe90502a6e5b30 ] Externally learned entries can be added by a user or by a switch driver that is notifying the bridge driver about entries that were learned in hardware. In the first case, the entries are not marked with the 'added_by_user' flag, which causes switch drivers to ignore them and not offload them. The 'added_by_user' flag can be set on externally learned FDB entries based on the 'swdev_notify' parameter in br_fdb_external_learn_add(), which effectively means if the created / updated FDB entry was added by a user or not. Fixes: 816a3bed9549 ("switchdev: Add fdb.added_by_user to switchdev notifications") Signed-off-by: Ido Schimmel Reported-by: Alexander Petrovskiy Reviewed-by: Petr Machata Cc: Roopa Prabhu Cc: Nikolay Aleksandrov Cc: bridge@lists.linux-foundation.org Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/bridge/br_fdb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index e56ba3912a905..8b8abf88befbd 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -1102,6 +1102,8 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, err = -ENOMEM; goto err_unlock; } + if (swdev_notify) + fdb->added_by_user = 1; fdb->added_by_external_learn = 1; fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } else { @@ -1121,6 +1123,9 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, modified = true; } + if (swdev_notify) + fdb->added_by_user = 1; + if (modified) fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify); } -- 2.19.1