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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 95EF6C282CA for ; Wed, 13 Feb 2019 02:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6322A20835 for ; Wed, 13 Feb 2019 02:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026698; bh=oTMGjszo6I0HjGUIDuK/cz8GozeNGBd4cUT4fhbWEco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GeH8Wg37o7Pc0Jl7sJyaQpyl6YtkRNvjAQbTgUI1K/Md8+eIKdvNsavr86oyIV3m3 ClYu2YfvhUeVMFS1IN4u/7GD2c0FrKKssHKDeXGbY5owFfvKtxVzwhAo2jORXJphRc rud59V814mT/MW1hXKLJVTN8bN7cBqOuMnDhgw6c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390072AbfBMC6N (ORCPT ); Tue, 12 Feb 2019 21:58:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:40198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388157AbfBMCgd (ORCPT ); Tue, 12 Feb 2019 21:36:33 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE379222D0; Wed, 13 Feb 2019 02:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025391; bh=oTMGjszo6I0HjGUIDuK/cz8GozeNGBd4cUT4fhbWEco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N8AoJ6azeFnqg1vUkYIQ/sdaDzRV9vgPs/ynS/tK01tMv4qwl9ulTCMQkWxCPxTvt Ph92LglLtbfgREAsf7vwLzTROU7FQKa+oSR26maCRd9wKtfBZj1P2A0bjiNXy3L+S0 RLkaA7lkt2/h9OpPBDHKEsFE5UYZBH4MA9WNaOXU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ido Schimmel , Roopa Prabhu , Nikolay Aleksandrov , bridge@lists.linux-foundation.org, "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 099/105] net: bridge: Mark FDB entries that were added by user as such Date: Tue, 12 Feb 2019 21:33:30 -0500 Message-Id: <20190213023336.19019-99-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023336.19019-1-sashal@kernel.org> References: <20190213023336.19019-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel [ 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 e56ba3912a90..8b8abf88befb 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