Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806746/?format=api
{ "id": 806746, "url": "http://patchwork.ozlabs.org/api/patches/806746/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170828191748.19492-8-vivien.didelot@savoirfairelinux.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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": "<20170828191748.19492-8-vivien.didelot@savoirfairelinux.com>", "list_archive_url": null, "date": "2017-08-28T19:17:45", "name": "[net-next,v2,07/10] net: dsa: restore mdb dump", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "c5da427c1da53827c502682bec0e317aa98ad6bf", "submitter": { "id": 15889, "url": "http://patchwork.ozlabs.org/api/people/15889/?format=api", "name": "Vivien Didelot", "email": "vivien.didelot@savoirfairelinux.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170828191748.19492-8-vivien.didelot@savoirfairelinux.com/mbox/", "series": [ { "id": 246, "url": "http://patchwork.ozlabs.org/api/series/246/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=246", "date": "2017-08-28T19:17:41", "name": "net: dsa: add generic debugfs interface", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/246/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806746/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806746/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh25Q4KDRz9sPk\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 29 Aug 2017 05:34:18 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751572AbdH1TZV (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 28 Aug 2017 15:25:21 -0400", "from mail.savoirfairelinux.com ([208.88.110.44]:36394 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1751237AbdH1TVk (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 28 Aug 2017 15:21:40 -0400", "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 254599C1B45;\n\tMon, 28 Aug 2017 15:21:40 -0400 (EDT)", "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10032)\n\twith ESMTP id 2Xda5T5bZYDi; Mon, 28 Aug 2017 15:21:39 -0400 (EDT)", "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 52ED29C2532;\n\tMon, 28 Aug 2017 15:21:38 -0400 (EDT)", "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10026)\n\twith ESMTP id OEqup3jNsQHg; Mon, 28 Aug 2017 15:21:37 -0400 (EDT)", "from weeman.mtl.sfl (unknown [192.168.50.91])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id BECAC9C1C7C;\n\tMon, 28 Aug 2017 15:21:37 -0400 (EDT)" ], "X-Virus-Scanned": "amavisd-new at mail.savoirfairelinux.com", "From": "Vivien Didelot <vivien.didelot@savoirfairelinux.com>", "To": "netdev@vger.kernel.org", "Cc": "linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tFlorian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>,\n\tEgil Hjelmeland <privat@egil-hjelmeland.no>,\n\tJohn Crispin <john@phrozen.org>, Woojung Huh <Woojung.Huh@microchip.com>,\n\tSean Wang <sean.wang@mediatek.com>,\n\tNikita Yushchenko <nikita.yoush@cogentembedded.com>,\n\tChris Healy <cphealy@gmail.com>,\n\tVivien Didelot <vivien.didelot@savoirfairelinux.com>", "Subject": "[PATCH net-next v2 07/10] net: dsa: restore mdb dump", "Date": "Mon, 28 Aug 2017 15:17:45 -0400", "Message-Id": "<20170828191748.19492-8-vivien.didelot@savoirfairelinux.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170828191748.19492-1-vivien.didelot@savoirfairelinux.com>", "References": "<20170828191748.19492-1-vivien.didelot@savoirfairelinux.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "The same dsa_fdb_dump_cb_t callback is used since there is no\ndistinction to do between FDB and MDB entries at this layer.\n\nImplement mv88e6xxx_port_mdb_dump so that multicast addresses associated\nto a switch port can be dumped.\n\nSigned-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>\nReviewed-by: Andrew Lunn <andrew@lunn.ch>\n---\n drivers/net/dsa/mv88e6xxx/chip.c | 33 +++++++++++++++++++++++++--------\n include/net/dsa.h | 3 +++\n 2 files changed, 28 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c\nindex c6678aa9b4ef..c66204423641 100644\n--- a/drivers/net/dsa/mv88e6xxx/chip.c\n+++ b/drivers/net/dsa/mv88e6xxx/chip.c\n@@ -1380,7 +1380,7 @@ static int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,\n }\n \n static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,\n-\t\t\t\t u16 fid, u16 vid, int port,\n+\t\t\t\t u16 fid, u16 vid, int port, bool mc,\n \t\t\t\t dsa_fdb_dump_cb_t *cb, void *data)\n {\n \tstruct mv88e6xxx_atu_entry addr;\n@@ -1401,11 +1401,14 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,\n \t\tif (addr.trunk || (addr.portvec & BIT(port)) == 0)\n \t\t\tcontinue;\n \n-\t\tif (!is_unicast_ether_addr(addr.mac))\n+\t\tif ((is_unicast_ether_addr(addr.mac) && mc) ||\n+\t\t (is_multicast_ether_addr(addr.mac) && !mc))\n \t\t\tcontinue;\n \n-\t\tis_static = (addr.state ==\n-\t\t\t MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);\n+\t\tis_static = addr.state == mc ?\n+\t\t\tMV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC :\n+\t\t\tMV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC;\n+\n \t\terr = cb(addr.mac, vid, is_static, data);\n \t\tif (err)\n \t\t\treturn err;\n@@ -1415,7 +1418,7 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,\n }\n \n static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,\n-\t\t\t\t dsa_fdb_dump_cb_t *cb, void *data)\n+\t\t\t\t bool mc, dsa_fdb_dump_cb_t *cb, void *data)\n {\n \tstruct mv88e6xxx_vtu_entry vlan = {\n \t\t.vid = chip->info->max_vid,\n@@ -1428,7 +1431,7 @@ static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,\n \tif (err)\n \t\treturn err;\n \n-\terr = mv88e6xxx_port_db_dump_fid(chip, fid, 0, port, cb, data);\n+\terr = mv88e6xxx_port_db_dump_fid(chip, fid, 0, port, mc, cb, data);\n \tif (err)\n \t\treturn err;\n \n@@ -1442,7 +1445,7 @@ static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,\n \t\t\tbreak;\n \n \t\terr = mv88e6xxx_port_db_dump_fid(chip, vlan.fid, vlan.vid, port,\n-\t\t\t\t\t\t cb, data);\n+\t\t\t\t\t\t mc, cb, data);\n \t\tif (err)\n \t\t\treturn err;\n \t} while (vlan.vid < chip->info->max_vid);\n@@ -1457,7 +1460,7 @@ static int mv88e6xxx_port_fdb_dump(struct dsa_switch *ds, int port,\n \tint err;\n \n \tmutex_lock(&chip->reg_lock);\n-\terr = mv88e6xxx_port_db_dump(chip, port, cb, data);\n+\terr = mv88e6xxx_port_db_dump(chip, port, false, cb, data);\n \tmutex_unlock(&chip->reg_lock);\n \n \treturn err;\n@@ -3777,6 +3780,19 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port,\n \treturn err;\n }\n \n+static int mv88e6xxx_port_mdb_dump(struct dsa_switch *ds, int port,\n+\t\t\t\t dsa_fdb_dump_cb_t *cb, void *data)\n+{\n+\tstruct mv88e6xxx_chip *chip = ds->priv;\n+\tint err;\n+\n+\tmutex_lock(&chip->reg_lock);\n+\terr = mv88e6xxx_port_db_dump(chip, port, true, cb, data);\n+\tmutex_unlock(&chip->reg_lock);\n+\n+\treturn err;\n+}\n+\n static const struct dsa_switch_ops mv88e6xxx_switch_ops = {\n \t.probe\t\t\t= mv88e6xxx_drv_probe,\n \t.get_tag_protocol\t= mv88e6xxx_get_tag_protocol,\n@@ -3810,6 +3826,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {\n \t.port_mdb_prepare = mv88e6xxx_port_mdb_prepare,\n \t.port_mdb_add = mv88e6xxx_port_mdb_add,\n \t.port_mdb_del = mv88e6xxx_port_mdb_del,\n+\t.port_mdb_dump = mv88e6xxx_port_mdb_dump,\n \t.crosschip_bridge_join\t= mv88e6xxx_crosschip_bridge_join,\n \t.crosschip_bridge_leave\t= mv88e6xxx_crosschip_bridge_leave,\n };\ndiff --git a/include/net/dsa.h b/include/net/dsa.h\nindex 1309ba0376ae..c0d1b6c47a50 100644\n--- a/include/net/dsa.h\n+++ b/include/net/dsa.h\n@@ -312,6 +312,7 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)\n \t\treturn ds->rtable[dst->cpu_dp->ds->index];\n }\n \n+/* FDB (and MDB) dump callback */\n typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid,\n \t\t\t bool is_static, void *data);\n struct dsa_switch_ops {\n@@ -441,6 +442,8 @@ struct dsa_switch_ops {\n \t\t\t\tstruct switchdev_trans *trans);\n \tint\t(*port_mdb_del)(struct dsa_switch *ds, int port,\n \t\t\t\tconst struct switchdev_obj_port_mdb *mdb);\n+\tint\t(*port_mdb_dump)(struct dsa_switch *ds, int port,\n+\t\t\t\t dsa_fdb_dump_cb_t *cb, void *data);\n \t/*\n \t * RXNFC\n \t */\n", "prefixes": [ "net-next", "v2", "07/10" ] }