netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, nhorman@tuxdriver.com, andy@greyhouse.net,
	tgraf@suug.ch, dborkman@redhat.com, ogerlitz@mellanox.com,
	jesse@nicira.com, pshelar@nicira.com, azhou@nicira.com,
	ben@decadent.org.uk, stephen@networkplumber.org,
	jeffrey.t.kirsher@intel.com, vyasevic@redhat.com,
	xiyou.wangcong@gmail.com, john.r.fastabend@intel.com,
	edumazet@google.com, jhs@mojatatu.com, sfeldma@gmail.com,
	f.fainelli@gmail.com, roopa@cumulusnetworks.com,
	linville@tuxdriver.com, jasowang@redhat.com,
	ebiederm@xmission.com, nicolas.dichtel@6wind.com,
	ryazanov.s.a@gmail.com, buytenh@wantstofly.org,
	aviadr@mellanox.com, nbd@openwrt.org,
	alexei.starovoitov@gmail.com, Neil.Jerram@metaswitch.com,
	ronye@mellanox.com, simon.horman@netronome.com,
	alexander.h.duyck@redhat.com, john.ronciak@intel.com,
	mleitner@redhat.com, shrijeet@gmail.com,
	gospo@cumulusnetworks.com, bcrl@kvack.org
Subject: [patch net-next v3 17/17] rocker: add ndo_bridge_setlnk/getlink support for learning policy
Date: Tue, 25 Nov 2014 11:28:48 +0100	[thread overview]
Message-ID: <1416911328-10979-18-git-send-email-jiri@resnulli.us> (raw)
In-Reply-To: <1416911328-10979-1-git-send-email-jiri@resnulli.us>

From: Scott Feldman <sfeldma@gmail.com>

Rocker ports will use new "swdev" hwmode for bridge port offload policy.
Current supported policy settings are BR_LEARNING and BR_LEARNING_SYNC.
User can turn on/off device port FDB learning and syncing to bridge.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
new in v3
---
 drivers/net/ethernet/rocker/rocker.c | 99 ++++++++++++++++++++++++++++++++++++
 drivers/net/ethernet/rocker/rocker.h |  1 +
 2 files changed, 100 insertions(+)

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 1434497..6d56960 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -203,6 +203,7 @@ struct rocker_port {
 	u32 lport;
 	__be16 internal_vlan_id;
 	int stp_state;
+	u32 brport_flags;
 	bool ctrls[ROCKER_CTRL_MAX];
 	unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN];
 	struct napi_struct napi_tx;
@@ -1629,6 +1630,30 @@ rocker_cmd_set_port_settings_macaddr_prep(struct rocker *rocker,
 	return 0;
 }
 
+static int
+rocker_cmd_set_port_learning_prep(struct rocker *rocker,
+				  struct rocker_port *rocker_port,
+				  struct rocker_desc_info *desc_info,
+				  void *priv)
+{
+	struct rocker_tlv *cmd_info;
+
+	if (rocker_tlv_put_u16(desc_info, ROCKER_TLV_CMD_TYPE,
+			       ROCKER_TLV_CMD_TYPE_SET_PORT_SETTINGS))
+		return -EMSGSIZE;
+	cmd_info = rocker_tlv_nest_start(desc_info, ROCKER_TLV_CMD_INFO);
+	if (!cmd_info)
+		return -EMSGSIZE;
+	if (rocker_tlv_put_u32(desc_info, ROCKER_TLV_CMD_PORT_SETTINGS_LPORT,
+			       rocker_port->lport))
+		return -EMSGSIZE;
+	if (rocker_tlv_put_u8(desc_info, ROCKER_TLV_CMD_PORT_SETTINGS_LEARNING,
+			      !!(rocker_port->brport_flags & BR_LEARNING)))
+		return -EMSGSIZE;
+	rocker_tlv_nest_end(desc_info, cmd_info);
+	return 0;
+}
+
 static int rocker_cmd_get_port_settings_ethtool(struct rocker_port *rocker_port,
 						struct ethtool_cmd *ecmd)
 {
@@ -1663,6 +1688,13 @@ static int rocker_cmd_set_port_settings_macaddr(struct rocker_port *rocker_port,
 			       macaddr, NULL, NULL, false);
 }
 
+static int rocker_port_set_learning(struct rocker_port *rocker_port)
+{
+	return rocker_cmd_exec(rocker_port->rocker, rocker_port,
+			       rocker_cmd_set_port_learning_prep,
+			       NULL, NULL, NULL, false);
+}
+
 static int rocker_cmd_flow_tbl_add_ig_port(struct rocker_desc_info *desc_info,
 					   struct rocker_flow_tbl_entry *entry)
 {
@@ -2995,6 +3027,7 @@ static int rocker_port_fdb_learn(struct rocker_port *rocker_port,
 	u32 out_lport = rocker_port->lport;
 	u32 tunnel_id = 0;
 	u32 group_id = ROCKER_GROUP_NONE;
+	bool syncing = !!(rocker_port->brport_flags & BR_LEARNING_SYNC);
 	bool copy_to_cpu = false;
 	int err;
 
@@ -3009,6 +3042,9 @@ static int rocker_port_fdb_learn(struct rocker_port *rocker_port,
 			return err;
 	}
 
+	if (!syncing)
+		return 0;
+
 	if (!rocker_port_is_bridged(rocker_port))
 		return 0;
 
@@ -3657,6 +3693,64 @@ skip:
 	return idx;
 }
 
+static int rocker_port_bridge_setlink(struct net_device *dev,
+				      struct nlmsghdr *nlh)
+{
+	struct rocker_port *rocker_port = netdev_priv(dev);
+	struct nlattr *protinfo;
+	struct nlattr *afspec;
+	struct nlattr *attr;
+	u16 mode;
+	int err;
+
+	protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
+				   IFLA_PROTINFO);
+	afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
+
+	if (afspec) {
+		attr = nla_find_nested(afspec, IFLA_BRIDGE_MODE);
+		if (attr) {
+			mode = nla_get_u16(attr);
+			if (mode != BRIDGE_MODE_SWDEV)
+				return -EINVAL;
+		}
+	}
+
+	if (protinfo) {
+		attr = nla_find_nested(protinfo, IFLA_BRPORT_LEARNING);
+		if (attr) {
+			if (nla_get_u8(attr))
+				rocker_port->brport_flags |= BR_LEARNING;
+			else
+				rocker_port->brport_flags &= ~BR_LEARNING;
+			err = rocker_port_set_learning(rocker_port);
+			if (err)
+				return err;
+		}
+		attr = nla_find_nested(protinfo, IFLA_BRPORT_LEARNING_SYNC);
+		if (attr) {
+			if (nla_get_u8(attr))
+				rocker_port->brport_flags |= BR_LEARNING_SYNC;
+			else
+				rocker_port->brport_flags &= ~BR_LEARNING_SYNC;
+		}
+	}
+
+	return 0;
+}
+
+static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+				      struct net_device *dev,
+				      u32 filter_mask)
+{
+	struct rocker_port *rocker_port = netdev_priv(dev);
+	u16 mode = BRIDGE_MODE_SWDEV;
+	u32 mask = BR_LEARNING | BR_LEARNING_SYNC;
+
+	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,
+				       rocker_port->brport_flags, mask);
+}
+
 static int rocker_port_switch_parent_id_get(struct net_device *dev,
 					    struct netdev_phys_item_id *psid)
 {
@@ -3685,6 +3779,8 @@ static const struct net_device_ops rocker_port_netdev_ops = {
 	.ndo_fdb_add			= rocker_port_fdb_add,
 	.ndo_fdb_del			= rocker_port_fdb_del,
 	.ndo_fdb_dump			= rocker_port_fdb_dump,
+	.ndo_bridge_setlink		= rocker_port_bridge_setlink,
+	.ndo_bridge_getlink		= rocker_port_bridge_getlink,
 	.ndo_switch_parent_id_get	= rocker_port_switch_parent_id_get,
 	.ndo_switch_port_stp_update	= rocker_port_switch_port_stp_update,
 };
@@ -3885,6 +3981,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
 	rocker_port->rocker = rocker;
 	rocker_port->port_number = port_number;
 	rocker_port->lport = port_number + 1;
+	rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC;
 
 	rocker_port_dev_addr_init(rocker, rocker_port);
 	dev->netdev_ops = &rocker_port_netdev_ops;
@@ -3904,6 +4001,8 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
 	}
 	rocker->ports[port_number] = rocker_port;
 
+	rocker_port_set_learning(rocker_port);
+
 	rocker_port->internal_vlan_id =
 		rocker_port_internal_vlan_id_get(rocker_port, dev->ifindex);
 	err = rocker_port_ig_tbl(rocker_port, 0);
diff --git a/drivers/net/ethernet/rocker/rocker.h b/drivers/net/ethernet/rocker/rocker.h
index 5251cf8..8d2865b 100644
--- a/drivers/net/ethernet/rocker/rocker.h
+++ b/drivers/net/ethernet/rocker/rocker.h
@@ -139,6 +139,7 @@ enum {
 	ROCKER_TLV_CMD_PORT_SETTINGS_AUTONEG,		/* u8 */
 	ROCKER_TLV_CMD_PORT_SETTINGS_MACADDR,		/* binary */
 	ROCKER_TLV_CMD_PORT_SETTINGS_MODE,		/* u8 */
+	ROCKER_TLV_CMD_PORT_SETTINGS_LEARNING,		/* u8 */
 
 	__ROCKER_TLV_CMD_PORT_SETTINGS_MAX,
 	ROCKER_TLV_CMD_PORT_SETTINGS_MAX =
-- 
1.9.3

  parent reply	other threads:[~2014-11-25 10:29 UTC|newest]

Thread overview: 148+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-25 10:28 [patch net-next v3 00/17] introduce rocker switch driver with hardware accelerated datapath api - phase 1: bridge fdb offload Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 01/17] bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion Jiri Pirko
2014-11-25 15:03   ` Andy Gospodarek
2014-11-25 15:26   ` Jamal Hadi Salim
2014-11-25 22:11   ` Thomas Graf
2014-11-25 22:33   ` Florian Fainelli
2014-11-25 10:28 ` [patch net-next v3 02/17] net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del Jiri Pirko
2014-11-25 15:13   ` Andy Gospodarek
2014-11-25 15:18     ` Jiri Pirko
2014-11-25 15:43       ` John Fastabend
2014-11-25 16:38         ` Jiri Pirko
2014-12-09 11:57         ` Or Gerlitz
2014-11-25 15:38   ` Jamal Hadi Salim
2014-11-25 16:01     ` John Fastabend
2014-11-25 16:18       ` Jamal Hadi Salim
2014-11-25 16:30         ` John Fastabend
2014-11-25 16:50           ` Jamal Hadi Salim
2014-11-26  1:44             ` Simon Horman
2014-11-26  2:36             ` Scott Feldman
2014-11-26  3:19               ` Jamal Hadi Salim
2014-11-26  3:59                 ` Scott Feldman
2014-11-26 11:28                   ` Jamal Hadi Salim
2014-11-26 11:40                     ` Jiri Pirko
2014-11-26 11:54                       ` Jamal Hadi Salim
2014-11-26 12:06                         ` Jamal Hadi Salim
2014-11-27  6:50                     ` Scott Feldman
2014-11-27 12:14                       ` Jamal Hadi Salim
2014-11-27 20:59                         ` Scott Feldman
2014-11-27 21:55                           ` Jiri Pirko
2014-11-28 12:57                             ` Jamal Hadi Salim
2014-11-28 10:14               ` Roopa Prabhu
2014-11-28 10:33                 ` Scott Feldman
2014-11-25 16:19     ` Roopa Prabhu
2014-11-25 16:33       ` John Fastabend
2014-11-25 16:57         ` Jamal Hadi Salim
2014-11-25 16:43       ` Jiri Pirko
2014-11-25 18:53   ` Samudrala, Sridhar
2014-11-25 20:40     ` Jiri Pirko
2014-11-25 22:14   ` Thomas Graf
2014-11-25 22:39     ` Florian Fainelli
2014-11-25 23:11       ` Thomas Graf
2014-11-26  7:54     ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 03/17] net: rename netdev_phys_port_id to more generic name Jiri Pirko
2014-11-25 15:15   ` Andy Gospodarek
2014-11-25 15:44   ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 04/17] net: introduce generic switch devices support Jiri Pirko
2014-11-25 15:02   ` Andy Gospodarek
2014-11-25 15:51   ` Jamal Hadi Salim
2014-11-25 16:49     ` Jiri Pirko
2014-11-25 17:08       ` Jamal Hadi Salim
2014-11-25 21:54         ` Thomas Graf
2014-11-26  3:33           ` Jamal Hadi Salim
2014-11-26  4:18             ` Scott Feldman
2014-11-26 11:36               ` Jamal Hadi Salim
2014-11-26 16:08                 ` Thomas Graf
2014-11-26 17:09                   ` Jamal Hadi Salim
2014-11-26 17:59                     ` Jiri Pirko
2014-11-26 21:50                       ` Thomas Graf
2014-11-26 23:32                         ` Jamal Hadi Salim
2014-11-27 13:03                           ` Thomas Graf
2014-11-27 13:32                             ` Jamal Hadi Salim
2014-11-27 13:50                               ` Jiri Pirko
2014-11-28 13:13                                 ` Jamal Hadi Salim
2014-11-27  5:58                 ` Scott Feldman
2014-11-27 12:46                   ` Jamal Hadi Salim
2014-11-27  3:13             ` Simon Horman
2014-11-27 12:35               ` Jamal Hadi Salim
2014-11-25 16:07   ` Roopa Prabhu
2014-11-25 16:50     ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 05/17] rtnl: expose physical switch id for particular device Jiri Pirko
2014-11-25 15:16   ` Andy Gospodarek
2014-11-25 10:28 ` [patch net-next v3 06/17] net-sysfs: " Jiri Pirko
2014-11-25 15:28   ` Andy Gospodarek
2014-11-25 15:53   ` Jamal Hadi Salim
2014-11-25 22:27   ` Florian Fainelli
2014-11-25 10:28 ` [patch net-next v3 07/17] rocker: introduce rocker switch driver Jiri Pirko
2014-11-25 15:57   ` Jamal Hadi Salim
2014-11-25 16:57     ` Jiri Pirko
2014-11-25 17:10     ` David Miller
2014-11-25 17:15       ` Jiri Pirko
2014-11-25 17:15         ` Jamal Hadi Salim
2014-11-25 17:51         ` Andy Gospodarek
2014-11-25 16:13   ` David Laight
2014-11-25 19:19     ` Scott Feldman
2014-11-25 21:57       ` tgraf
2014-11-25 10:28 ` [patch net-next v3 08/17] bridge: call netdev_sw_port_stp_update when bridge port STP status changes Jiri Pirko
2014-11-25 15:58   ` Andy Gospodarek
2014-11-25 16:53     ` Jiri Pirko
2014-11-25 22:18       ` Thomas Graf
2014-11-25 22:20     ` Florian Fainelli
2014-11-25 22:48   ` Roopa Prabhu
2014-11-26  1:35     ` Scott Feldman
2014-11-28 10:05       ` Roopa Prabhu
2014-11-28 10:51         ` Scott Feldman
2014-11-28 13:17           ` Jamal Hadi Salim
2014-11-28 13:27             ` Jiri Pirko
2014-11-28 16:23             ` Roopa Prabhu
2014-11-25 10:28 ` [patch net-next v3 09/17] bridge: add API to notify bridge driver of learned FBD on offloaded device Jiri Pirko
2014-11-25 16:01   ` Jamal Hadi Salim
2014-11-25 16:38   ` Andy Gospodarek
2014-11-25 22:36     ` Thomas Graf
2014-11-26  1:48       ` Scott Feldman
2014-11-26 10:26         ` Jiri Pirko
2014-11-25 22:44   ` Florian Fainelli
2014-11-26  2:03     ` Scott Feldman
2014-11-26  2:34       ` Florian Fainelli
2014-11-26  2:40         ` Scott Feldman
2014-11-26  8:16           ` Jiri Pirko
2014-11-26  3:22     ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 10/17] rocker: implement rocker ofdpa flow table manipulation Jiri Pirko
2014-11-25 16:03   ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 11/17] rocker: implement L2 bridge offloading Jiri Pirko
2014-11-25 16:04   ` Jamal Hadi Salim
2014-11-25 17:11     ` David Miller
2014-11-25 10:28 ` [patch net-next v3 12/17] rocker: implement ndo_fdb_dump Jiri Pirko
2014-11-25 16:04   ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 13/17] bridge: move private brport flags to if_bridge.h so port drivers can use flags Jiri Pirko
2014-11-25 16:01   ` Andy Gospodarek
2014-11-25 16:05   ` Jamal Hadi Salim
2014-11-25 22:20   ` Florian Fainelli
2014-11-25 22:48   ` Thomas Graf
2014-11-26 12:12     ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 14/17] bridge: add new brport flag LEARNING_SYNC Jiri Pirko
2014-11-25 16:05   ` Roopa Prabhu
2014-11-25 16:06   ` Jamal Hadi Salim
2014-11-25 16:40   ` Andy Gospodarek
2014-11-25 10:28 ` [patch net-next v3 15/17] bridge: add new hwmode swdev Jiri Pirko
2014-11-25 16:03   ` Roopa Prabhu
2014-11-25 16:17     ` Andy Gospodarek
2014-11-25 22:56       ` Thomas Graf
2014-11-25 16:07   ` Jamal Hadi Salim
2014-11-25 23:00     ` Thomas Graf
2014-11-25 10:28 ` [patch net-next v3 16/17] bridge: add brport flags to dflt bridge_getlink Jiri Pirko
2014-11-25 16:08   ` Jamal Hadi Salim
2014-11-25 17:02     ` Scott Feldman
2014-11-25 17:48   ` Andy Gospodarek
2014-11-25 22:07   ` Thomas Graf
2014-11-26  9:25     ` Jiri Pirko
2014-11-26 10:48       ` Thomas Graf
2014-11-25 10:28 ` Jiri Pirko [this message]
2014-11-25 16:09   ` [patch net-next v3 17/17] rocker: add ndo_bridge_setlnk/getlink support for learning policy Jamal Hadi Salim
2014-11-25 18:55     ` Scott Feldman
2014-11-25 19:00       ` Jamal Hadi Salim
2014-11-25 20:42         ` Jiri Pirko
2014-11-26 11:07   ` Thomas Graf
2014-11-26 11:27     ` Jiri Pirko
2014-11-26 11:30       ` Thomas Graf
2014-11-26 11:42         ` Jiri Pirko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1416911328-10979-18-git-send-email-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=Neil.Jerram@metaswitch.com \
    --cc=alexander.h.duyck@redhat.com \
    --cc=alexei.starovoitov@gmail.com \
    --cc=andy@greyhouse.net \
    --cc=aviadr@mellanox.com \
    --cc=azhou@nicira.com \
    --cc=bcrl@kvack.org \
    --cc=ben@decadent.org.uk \
    --cc=buytenh@wantstofly.org \
    --cc=davem@davemloft.net \
    --cc=dborkman@redhat.com \
    --cc=ebiederm@xmission.com \
    --cc=edumazet@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=gospo@cumulusnetworks.com \
    --cc=jasowang@redhat.com \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=jesse@nicira.com \
    --cc=jhs@mojatatu.com \
    --cc=john.r.fastabend@intel.com \
    --cc=john.ronciak@intel.com \
    --cc=linville@tuxdriver.com \
    --cc=mleitner@redhat.com \
    --cc=nbd@openwrt.org \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=nicolas.dichtel@6wind.com \
    --cc=ogerlitz@mellanox.com \
    --cc=pshelar@nicira.com \
    --cc=ronye@mellanox.com \
    --cc=roopa@cumulusnetworks.com \
    --cc=ryazanov.s.a@gmail.com \
    --cc=sfeldma@gmail.com \
    --cc=shrijeet@gmail.com \
    --cc=simon.horman@netronome.com \
    --cc=stephen@networkplumber.org \
    --cc=tgraf@suug.ch \
    --cc=vyasevic@redhat.com \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).