From: Ansuel Smith <ansuelsmth@gmail.com>
To: Vladimir Oltean <olteanv@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [net-next PATCH 14/19] net: dsa: qca8k: add support for mdb_add/del
Date: Fri, 19 Nov 2021 03:19:30 +0100 [thread overview]
Message-ID: <619709b5.1c69fb81.83cb5.4150@mx.google.com> (raw)
In-Reply-To: <20211119020657.77os25yh4vhiukvi@skbuf>
On Fri, Nov 19, 2021 at 04:06:57AM +0200, Vladimir Oltean wrote:
> On Wed, Nov 17, 2021 at 10:04:46PM +0100, Ansuel Smith wrote:
> > Add support for mdb add/del function. The ARL table is used to insert
> > the rule. A new search function is introduced to search the rule and add
> > additional port to it. If every port is removed from the rule, it's
> > removed. It's set STATIC in the ARL table (aka it doesn't age) to not be
> > flushed by fast age function.
> >
> > Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> > ---
> > drivers/net/dsa/qca8k.c | 82 +++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 82 insertions(+)
> >
> > diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
> > index dda99263fe8c..a217c842ab45 100644
> > --- a/drivers/net/dsa/qca8k.c
> > +++ b/drivers/net/dsa/qca8k.c
> > @@ -417,6 +417,23 @@ qca8k_fdb_flush(struct qca8k_priv *priv)
> > mutex_unlock(&priv->reg_mutex);
> > }
> >
> > +static int
> > +qca8k_fdb_search(struct qca8k_priv *priv, struct qca8k_fdb *fdb, const u8 *mac, u16 vid)
> > +{
> > + int ret;
> > +
> > + mutex_lock(&priv->reg_mutex);
>
> If I were you, I'd create a locking scheme where the entire FDB entry is
> updated under the same critical section. Right now you're relying on the
> rtnl_mutex serializing calls to ->port_mdb_add()/->port_mdb_del(). But
> that might change. Don't leave that task to someone that has non-expert
> knowledge of the driver.
>
Ok will change the logic and do the search and add/del operation in one
lock.
> > + qca8k_fdb_write(priv, vid, 0, mac, 0);
> > + ret = qca8k_fdb_access(priv, QCA8K_FDB_SEARCH, -1);
> > + if (ret < 0)
> > + goto exit;
> > +
> > + ret = qca8k_fdb_read(priv, fdb);
> > +exit:
> > + mutex_unlock(&priv->reg_mutex);
> > + return ret;
> > +}
> > +
> > static int
> > qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid)
> > {
> > @@ -1959,6 +1976,69 @@ qca8k_port_fdb_dump(struct dsa_switch *ds, int port,
> > return 0;
> > }
> >
> > +static int
> > +qca8k_port_mdb_add(struct dsa_switch *ds, int port,
> > + const struct switchdev_obj_port_mdb *mdb)
> > +{
> > + struct qca8k_priv *priv = ds->priv;
> > + struct qca8k_fdb fdb = { 0 };
> > + const u8 *addr = mdb->addr;
> > + u8 port_mask = BIT(port);
>
> This doesn't really need to be kept in a temporary variable as it is
> only used once.
>
> > + u16 vid = mdb->vid;
> > + int ret;
> > +
> > + /* Check if entry already exist */
> > + ret = qca8k_fdb_search(priv, &fdb, addr, vid);
> > + if (ret < 0)
> > + return ret;
> > +
> > + /* Rule exist. Delete first */
> > + if (!fdb.aging) {
> > + ret = qca8k_fdb_del(priv, addr, fdb.port_mask, vid);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > + /* Add port to fdb portmask */
> > + fdb.port_mask |= port_mask;
> > +
> > + return qca8k_port_fdb_insert(priv, addr, fdb.port_mask, vid);
> > +}
> > +
> > +static int
> > +qca8k_port_mdb_del(struct dsa_switch *ds, int port,
> > + const struct switchdev_obj_port_mdb *mdb)
> > +{
> > + struct qca8k_priv *priv = ds->priv;
> > + struct qca8k_fdb fdb = { 0 };
> > + const u8 *addr = mdb->addr;
> > + u8 port_mask = BIT(port);
> > + u16 vid = mdb->vid;
> > + int ret;
> > +
> > + /* Check if entry already exist */
> > + ret = qca8k_fdb_search(priv, &fdb, addr, vid);
> > + if (ret < 0)
> > + return ret;
> > +
> > + /* Rule doesn't exist. Why delete? */
>
> Because refcounting is hard. In fact with VLANs it is quite possible to
> delete an absent entry. For MDBs and FDBs, the bridge should now error
> out before it even reaches to you.
>
So in this specific case I should simply return 0 to correctly decrement
the ref, correct?
> > + if (!fdb.aging)
> > + return -EINVAL;
> > +
> > + ret = qca8k_fdb_del(priv, addr, port_mask, vid);
> > + if (ret)
> > + return ret;
> > +
> > + /* Only port in the rule is this port. Don't re insert */
> > + if (fdb.port_mask == port_mask)
> > + return 0;
> > +
> > + /* Remove port from port mask */
> > + fdb.port_mask &= ~port_mask;
> > +
> > + return qca8k_port_fdb_insert(priv, addr, fdb.port_mask, vid);
> > +}
> > +
> > static int
> > qca8k_port_mirror_add(struct dsa_switch *ds, int port,
> > struct dsa_mall_mirror_tc_entry *mirror,
> > @@ -2160,6 +2240,8 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
> > .port_fdb_add = qca8k_port_fdb_add,
> > .port_fdb_del = qca8k_port_fdb_del,
> > .port_fdb_dump = qca8k_port_fdb_dump,
> > + .port_mdb_add = qca8k_port_mdb_add,
> > + .port_mdb_del = qca8k_port_mdb_del,
> > .port_mirror_add = qca8k_port_mirror_add,
> > .port_mirror_del = qca8k_port_mirror_del,
> > .port_vlan_filtering = qca8k_port_vlan_filtering,
> > --
> > 2.32.0
> >
>
--
Ansuel
next prev parent reply other threads:[~2021-11-19 2:19 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 21:04 [net-next PATCH 00/19] Multiple cleanup and feature for qca8k Ansuel Smith
2021-11-17 21:04 ` regmap: allow to define reg_update_bits for no bus configuration Ansuel Smith
2021-11-17 22:15 ` Mark Brown
2021-11-17 22:19 ` Ansuel Smith
2021-11-17 22:33 ` Mark Brown
2021-11-19 1:54 ` Jakub Kicinski
2021-11-19 2:00 ` Ansuel Smith
2021-11-19 2:00 ` patchwork-bot+netdevbpf
2021-11-17 21:04 ` [net-next PATCH 02/19] net: dsa: qca8k: remove redundant check in parse_port_config Ansuel Smith
2021-11-18 23:59 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 03/19] net: dsa: qca8k: skip sgmii delay on double cpu conf Ansuel Smith
2021-11-19 0:58 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 04/19] net: dsa: qca8k: convert to GENMASK/FIELD_PREP/FIELD_GET Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 05/19] net: dsa: qca8k: move read switch id function in qca8k_setup Ansuel Smith
2021-11-19 1:03 ` Vladimir Oltean
2021-11-19 1:08 ` Ansuel Smith
2021-11-21 18:34 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 06/19] net: dsa: qca8k: remove extra mutex_init " Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 07/19] net: dsa: qca8k: set regmap init as mandatory for regmap conversion Ansuel Smith
2021-11-19 1:09 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 08/19] net: dsa: qca8k: convert qca8k to regmap helper Ansuel Smith
2021-11-19 1:14 ` Vladimir Oltean
2021-11-19 1:28 ` Ansuel Smith
2021-11-21 18:31 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 09/19] net: dsa: qca8k: add additional MIB counter and make it dynamic Ansuel Smith
2021-11-19 1:17 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 10/19] net: dsa: qca8k: add support for port fast aging Ansuel Smith
2021-11-19 1:20 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 11/19] net: dsa: qca8k: add support for mirror mode Ansuel Smith
2021-11-19 1:42 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 12/19] net: dsa: qca8k: add set_ageing_time support Ansuel Smith
2021-11-19 1:47 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 13/19] net: dsa: qca8k: add min/max ageing time Ansuel Smith
2021-11-19 1:49 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 14/19] net: dsa: qca8k: add support for mdb_add/del Ansuel Smith
2021-11-19 2:06 ` Vladimir Oltean
2021-11-19 2:19 ` Ansuel Smith [this message]
2021-11-19 2:33 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 15/19] net: dsa: qca8k: add LAG support Ansuel Smith
2021-11-19 2:13 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 16/19] net: dsa: qca8k: enable mtu_enforcement_ingress Ansuel Smith
2021-11-19 2:20 ` Vladimir Oltean
2021-11-19 2:28 ` Ansuel Smith
2021-11-21 18:11 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 17/19] net: dsa: qca8k: move qca8k to qca dir Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 18/19] net: dsa: qca8k: use device_get_match_data instead of the OF variant Ansuel Smith
2021-11-19 2:21 ` Vladimir Oltean
2021-11-19 2:32 ` Ansuel Smith
2021-11-21 18:03 ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 19/19] net: dsa: qca8k: split qca8k in common and 8xxx specific code Ansuel Smith
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=619709b5.1c69fb81.83cb5.4150@mx.google.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@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).