From patchwork Mon Jun 5 09:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 771135 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 3wh8SQ28X1z9s76 for ; Mon, 5 Jun 2017 19:20:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Y/xYssSX"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751742AbdFEJUv (ORCPT ); Mon, 5 Jun 2017 05:20:51 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36173 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512AbdFEJUt (ORCPT ); Mon, 5 Jun 2017 05:20:49 -0400 Received: by mail-wm0-f66.google.com with SMTP id k15so28807261wmh.3 for ; Mon, 05 Jun 2017 02:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r4Z7fckO3NS2F20Wof68g2d5pdAwq28lUUf8H+pHPWU=; b=Y/xYssSXWrjcpH5glb+uBlvcLoiehSaB+sR9wuffH8YV0vNQYvdUwoaT+Owb5DfI9j e9vNisTC/Z0ei1/NcVH0MI02KLkS/ecAp2162sr4TItDBGjGTMJqKnlLUeU7xcYP6knP /d+/hBauI0ZbYqEPkjbhPcPuvYYu4pSChNzeBT8r2hZZkZPI92lF6hVHyyM4K0PHkxYv aspYBqPq1NtgTOWoKG7Tu7CEk7k/25iM5SwlYT1SeW+/IuVr5MRfCr7vt8LLNmjn8mAL PtK5MJ40oWAn/JhOJocgVqCHtZbNgLEZk2DuKd4Kc281+9Nu5d7Il/j4XM2GCwfDpya/ 23Jw== 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:in-reply-to :references; bh=r4Z7fckO3NS2F20Wof68g2d5pdAwq28lUUf8H+pHPWU=; b=GCy6E8Bto7T8FXn2U279ln+1L1o2ThxqDS5DbLvfJeYL6jpjQNuFnr5F6l+X5V0zjC qh1hlYlp+oIzKiDoJaBIcU94YFYllx+u/anQdOZCDPV3EgRNiKlFoE0KEMHYXUX3H5Ju GuYNMvyZku4zCtSoDH9hOJ+hNhpl8jyhybOLkzhFB1IoweeO1WAbh2rSzty5+9sMpH/0 OV2pe4KS9oeCiIa8eHq1JvMHIaLgCOyQvwBt3O3b1ld/IgOUVuhPOkpgX5TBxenSb5oy hiW1klZJTpmgh2yiTP9fZSrlbrs5dKDSTCcmIU0lALRHHPgx/T4J9MRCbAsR+9aaHj1P 8izQ== X-Gm-Message-State: AODbwcD6mxi9Ctf1cSCufzJO19Rl1azzdXk2SmHmcu/SL0eQ1SZU2Rzd iiwvpgw+c882sQxl0mM= X-Received: by 10.28.130.196 with SMTP id e187mr7577753wmd.24.1496654447233; Mon, 05 Jun 2017 02:20:47 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id x17sm18396761wrd.63.2017.06.05.02.20.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Jun 2017 02:20:46 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, arkadis@mellanox.com, mlxsw@mellanox.com, roopa@cumulusnetworks.com, stephen@networkplumber.org, ivecera@redhat.com Subject: [patch net-next 02/19] net: bridge: Add support for offloading port attributes Date: Mon, 5 Jun 2017 11:20:26 +0200 Message-Id: <20170605092043.3523-3-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170605092043.3523-1-jiri@resnulli.us> References: <20170605092043.3523-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arkadi Sharshevsky Currently the flood, learning and learning_sync port attributes are offloaded by setting the SELF flag. Add support for offloading the flood and learning attribute through the bridge code. In case of setting an unsupported flag on a offloded port the operation will fail. The learning_sync attribute doesn't have any software representation and cannot be offloaded through the bridge code. Signed-off-by: Arkadi Sharshevsky Reviewed-by: Ido Schimmel Signed-off-by: Jiri Pirko --- net/bridge/br_netlink.c | 112 +++++++++++++++++++++++++++++++++++++++--------- net/bridge/br_private.h | 4 ++ 2 files changed, 96 insertions(+), 20 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 1e63ec4..1afafb7 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "br_private.h" #include "br_private_stp.h" @@ -662,16 +663,52 @@ static int br_set_port_state(struct net_bridge_port *p, u8 state) } /* Set/clear or port flags based on attribute */ -static void br_set_port_flag(struct net_bridge_port *p, struct nlattr *tb[], - int attrtype, unsigned long mask) +static int br_set_port_flag(struct net_bridge_port *p, struct nlattr *tb[], + int attrtype, unsigned long mask) { - if (tb[attrtype]) { - u8 flag = nla_get_u8(tb[attrtype]); - if (flag) - p->flags |= mask; - else - p->flags &= ~mask; + struct switchdev_attr attr = { + .orig_dev = p->dev, + .id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, + }; + unsigned long flags; + int err; + + if (!tb[attrtype]) + return 0; + + if (nla_get_u8(tb[attrtype])) + flags = p->flags | mask; + else + flags = p->flags & ~mask; + + if (mask & ~BR_PORT_FLAGS_HW_OFFLOAD) + goto out; + + err = switchdev_port_attr_get(p->dev, &attr); + if (err == -EOPNOTSUPP) + goto out; + if (err) + return err; + + /* Check if specific bridge flag attribute offload is supported */ + if (!(attr.u.brport_flags_support & mask)) { + br_warn(p->br, "bridge flag offload is not supported %u(%s)\n", + (unsigned int)p->port_no, p->dev->name); + return -EOPNOTSUPP; + } + + attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS; + attr.flags = SWITCHDEV_F_DEFER; + attr.u.brport_flags = flags; + err = switchdev_port_attr_set(p->dev, &attr); + if (err) { + br_warn(p->br, "error setting offload FLAG on port %u(%s)\n", + (unsigned int)p->port_no, p->dev->name); + return err; } +out: + p->flags = flags; + return 0; } /* Process bridge protocol info on port */ @@ -681,20 +718,55 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[]) bool br_vlan_tunnel_old = false; int err; - br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE); - br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD); - br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE); - br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK); - br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING); - br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD); - br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD); - br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST); - br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD); - br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP); - br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI); + err = br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP); + if (err) + return err; + + err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI); + if (err) + return err; br_vlan_tunnel_old = (p->flags & BR_VLAN_TUNNEL) ? true : false; - br_set_port_flag(p, tb, IFLA_BRPORT_VLAN_TUNNEL, BR_VLAN_TUNNEL); + err = br_set_port_flag(p, tb, IFLA_BRPORT_VLAN_TUNNEL, BR_VLAN_TUNNEL); + if (err) + return err; + if (br_vlan_tunnel_old && !(p->flags & BR_VLAN_TUNNEL)) nbp_vlan_tunnel_info_flush(p); diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 2062692..5dc30ed 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -42,6 +42,10 @@ /* Path to usermode spanning tree program */ #define BR_STP_PROG "/sbin/bridge-stp" +/* Flags that can be offloaded to hardware */ +#define BR_PORT_FLAGS_HW_OFFLOAD (BR_LEARNING | BR_FLOOD | \ + BR_MCAST_FLOOD | BR_BCAST_FLOOD) + typedef struct bridge_id bridge_id; typedef struct mac_addr mac_addr; typedef __u16 port_id;