{"id":810322,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810322/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504654510-31004-6-git-send-email-andrew@lunn.ch/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504654510-31004-6-git-send-email-andrew@lunn.ch>","list_archive_url":null,"date":"2017-09-05T23:35:07","name":"[v2,rfc,5/8] net: dsa: switch: handle host mdb add/remove","commit_ref":null,"pull_url":null,"state":"rfc","archived":true,"hash":"d51b6697e0dcf3d58825ce9d5364fe4ce576a0f1","submitter":{"id":13608,"url":"http://patchwork.ozlabs.org/api/1.2/people/13608/?format=json","name":"Andrew Lunn","email":"andrew@lunn.ch"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504654510-31004-6-git-send-email-andrew@lunn.ch/mbox/","series":[{"id":1666,"url":"http://patchwork.ozlabs.org/api/1.2/series/1666/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1666","date":"2017-09-05T23:35:04","name":"IGMP snooping for local traffic","version":2,"mbox":"http://patchwork.ozlabs.org/series/1666/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810322/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810322/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xn35K6z4Qz9s7h\n\tfor ;\n\tWed, 6 Sep 2017 09:36:37 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754009AbdIEXgg (ORCPT );\n\tTue, 5 Sep 2017 19:36:36 -0400","from vps0.lunn.ch ([178.209.37.122]:58206 \"EHLO vps0.lunn.ch\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753545AbdIEXgf (ORCPT );\n\tTue, 5 Sep 2017 19:36:35 -0400","from andrew by vps0.lunn.ch with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dpNNG-000852-IV; Wed, 06 Sep 2017 01:35:18 +0200"],"From":"Andrew Lunn ","To":"netdev ","Cc":"jiri@resnulli.us, nikolay@cumulusnetworks.com,\n\tFlorian Fainelli ,\n\tVivien Didelot ,\n\tAndrew Lunn ","Subject":"[PATCH v2 rfc 5/8] net: dsa: switch: handle host mdb add/remove","Date":"Wed, 6 Sep 2017 01:35:07 +0200","Message-Id":"<1504654510-31004-6-git-send-email-andrew@lunn.ch>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504654510-31004-1-git-send-email-andrew@lunn.ch>","References":"<1504654510-31004-1-git-send-email-andrew@lunn.ch>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"When receiving notifications of the host mdb add/remove, add/remove an\nmdb to the CPU port, so that traffic flows from a port to the CPU port\nand hence to the host.\n\nSigned-off-by: Andrew Lunn \n---\n net/dsa/switch.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++----------\n 1 file changed, 60 insertions(+), 12 deletions(-)","diff":"diff --git a/net/dsa/switch.c b/net/dsa/switch.c\nindex e6c06aa349a6..326680039c52 100644\n--- a/net/dsa/switch.c\n+++ b/net/dsa/switch.c\n@@ -108,22 +108,14 @@ static int dsa_switch_fdb_del(struct dsa_switch *ds,\n \t\t\t\t info->vid);\n }\n \n-static int dsa_switch_mdb_add(struct dsa_switch *ds,\n-\t\t\t struct dsa_notifier_mdb_info *info)\n+static int dsa_switch_mdb_add_bitmap(struct dsa_switch *ds,\n+\t\t\t\t struct dsa_notifier_mdb_info *info,\n+\t\t\t\t const struct switchdev_obj_port_mdb *mdb,\n+\t\t\t\t unsigned long *group)\n {\n-\tconst struct switchdev_obj_port_mdb *mdb = info->mdb;\n \tstruct switchdev_trans *trans = info->trans;\n-\tDECLARE_BITMAP(group, ds->num_ports);\n \tint port, err;\n \n-\t/* Build a mask of Multicast group members */\n-\tbitmap_zero(group, ds->num_ports);\n-\tif (ds->index == info->sw_index)\n-\t\tset_bit(info->port, group);\n-\tfor (port = 0; port < ds->num_ports; port++)\n-\t\tif (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))\n-\t\t\tset_bit(port, group);\n-\n \tif (switchdev_trans_ph_prepare(trans)) {\n \t\tif (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)\n \t\t\treturn -EOPNOTSUPP;\n@@ -141,6 +133,40 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds,\n \treturn 0;\n }\n \n+static int dsa_switch_mdb_add(struct dsa_switch *ds,\n+\t\t\t struct dsa_notifier_mdb_info *info)\n+{\n+\tconst struct switchdev_obj_port_mdb *mdb = info->mdb;\n+\tDECLARE_BITMAP(group, ds->num_ports);\n+\tint port;\n+\n+\t/* Build a mask of Multicast group members */\n+\tbitmap_zero(group, ds->num_ports);\n+\tif (ds->index == info->sw_index)\n+\t\tset_bit(info->port, group);\n+\tfor (port = 0; port < ds->num_ports; port++)\n+\t\tif (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))\n+\t\t\tset_bit(port, group);\n+\n+\treturn dsa_switch_mdb_add_bitmap(ds, info, mdb, group);\n+}\n+\n+static int dsa_switch_host_mdb_add(struct dsa_switch *ds,\n+\t\t\t\t struct dsa_notifier_mdb_info *info)\n+{\n+\tconst struct switchdev_obj_port_mdb *mdb = info->mdb;\n+\tDECLARE_BITMAP(group, ds->num_ports);\n+\tint port;\n+\n+\t/* Build a mask of Multicast group members */\n+\tbitmap_zero(group, ds->num_ports);\n+\tfor (port = 0; port < ds->num_ports; port++)\n+\t\tif (dsa_is_cpu_port(ds, port))\n+\t\t\tset_bit(port, group);\n+\n+\treturn dsa_switch_mdb_add_bitmap(ds, info, mdb, group);\n+}\n+\n static int dsa_switch_mdb_del(struct dsa_switch *ds,\n \t\t\t struct dsa_notifier_mdb_info *info)\n {\n@@ -155,6 +181,22 @@ static int dsa_switch_mdb_del(struct dsa_switch *ds,\n \treturn 0;\n }\n \n+static int dsa_switch_host_mdb_del(struct dsa_switch *ds,\n+\t\t\t\t struct dsa_notifier_mdb_info *info)\n+{\n+\tconst struct switchdev_obj_port_mdb *mdb = info->mdb;\n+\tint port;\n+\n+\tif (!ds->ops->port_mdb_del)\n+\t\treturn -EOPNOTSUPP;\n+\n+\tfor (port = 0; port < ds->num_ports; port++)\n+\t\tif (dsa_is_cpu_port(ds, port))\n+\t\t\tds->ops->port_mdb_del(ds, port, mdb);\n+\n+\treturn 0;\n+}\n+\n static int dsa_switch_vlan_add(struct dsa_switch *ds,\n \t\t\t struct dsa_notifier_vlan_info *info)\n {\n@@ -230,6 +272,12 @@ static int dsa_switch_event(struct notifier_block *nb,\n \tcase DSA_NOTIFIER_MDB_DEL:\n \t\terr = dsa_switch_mdb_del(ds, info);\n \t\tbreak;\n+\tcase DSA_NOTIFIER_HOST_MDB_ADD:\n+\t\terr = dsa_switch_host_mdb_add(ds, info);\n+\t\tbreak;\n+\tcase DSA_NOTIFIER_HOST_MDB_DEL:\n+\t\terr = dsa_switch_host_mdb_del(ds, info);\n+\t\tbreak;\n \tcase DSA_NOTIFIER_VLAN_ADD:\n \t\terr = dsa_switch_vlan_add(ds, info);\n \t\tbreak;\n","prefixes":["v2","rfc","5/8"]}