From: Guenter Roeck <linux@roeck-us.net>
To: Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>, Scott Feldman <sfeldma@gmail.com>,
Jiri Pirko <jiri@resnulli.us>,
Jerome Oufella <jerome.oufella@savoirfairelinux.com>,
linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,
Chris Healy <cphealy@gmail.com>
Subject: Re: [RFC 2/9] net: dsa: add basic support for VLAN operations
Date: Mon, 01 Jun 2015 23:52:41 -0700 [thread overview]
Message-ID: <556D52B9.1040004@roeck-us.net> (raw)
In-Reply-To: <1433208470-25338-3-git-send-email-vivien.didelot@savoirfairelinux.com>
On 06/01/2015 06:27 PM, Vivien Didelot wrote:
> This patch adds the glue between DSA and switchdev to add and delete
> SWITCHDEV_OBJ_PORT_VLAN objects.
>
> This will allow the DSA switch drivers implementing the port_vlan_add
> and port_vlan_del functions to access the switch VLAN database through
> userspace commands such as "bridge vlan".
>
> Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
> ---
> include/net/dsa.h | 7 +++++++
> net/dsa/slave.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 2 files changed, 66 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/dsa.h b/include/net/dsa.h
> index fbca63b..726357b 100644
> --- a/include/net/dsa.h
> +++ b/include/net/dsa.h
> @@ -302,6 +302,13 @@ struct dsa_switch_driver {
> const unsigned char *addr, u16 vid);
> int (*fdb_getnext)(struct dsa_switch *ds, int port,
> unsigned char *addr, bool *is_static);
> +
> + /*
> + * VLAN support
> + */
> + int (*port_vlan_add)(struct dsa_switch *ds, int port, u16 vid,
> + u16 bridge_flags);
> + int (*port_vlan_del)(struct dsa_switch *ds, int port, u16 vid);
> };
>
> void register_switch_driver(struct dsa_switch_driver *type);
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index cbda00a..52ba5a1 100644
> --- a/net/dsa/slave.c
> +++ b/net/dsa/slave.c
> @@ -363,6 +363,25 @@ static int dsa_slave_port_attr_set(struct net_device *dev,
> return ret;
> }
>
> +static int dsa_slave_port_vlans_add(struct net_device *dev,
> + struct switchdev_obj_vlan *vlan)
> +{
> + struct dsa_slave_priv *p = netdev_priv(dev);
> + struct dsa_switch *ds = p->parent;
> + int vid, err = 0;
> +
> + if (!ds->drv->port_vlan_add)
> + return -ENOTSUPP;
> +
> + for (vid = vlan->vid_start; vid <= vlan->vid_end; ++vid) {
> + err = ds->drv->port_vlan_add(ds, p->port, vid, vlan->flags);
> + if (err)
> + break;
> + }
> +
> + return err;
> +}
> +
> static int dsa_slave_port_obj_add(struct net_device *dev,
> struct switchdev_obj *obj)
> {
> @@ -378,6 +397,9 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
> return 0;
>
> switch (obj->id) {
> + case SWITCHDEV_OBJ_PORT_VLAN:
> + err = dsa_slave_port_vlans_add(dev, &obj->u.vlan);
> + break;
> default:
> err = -ENOTSUPP;
> break;
> @@ -386,12 +408,34 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
> return err;
> }
>
> +static int dsa_slave_port_vlans_del(struct net_device *dev,
> + struct switchdev_obj_vlan *vlan)
> +{
> + struct dsa_slave_priv *p = netdev_priv(dev);
> + struct dsa_switch *ds = p->parent;
> + int vid, err = 0;
> +
> + if (!ds->drv->port_vlan_del)
> + return -ENOTSUPP;
> +
> + for (vid = vlan->vid_start; vid <= vlan->vid_end; ++vid) {
> + err = ds->drv->port_vlan_del(ds, p->port, vid);
> + if (err)
> + break;
> + }
> +
> + return err;
> +}
> +
> static int dsa_slave_port_obj_del(struct net_device *dev,
> struct switchdev_obj *obj)
> {
> int err;
>
> switch (obj->id) {
> + case SWITCHDEV_OBJ_PORT_VLAN:
> + err = dsa_slave_port_vlans_del(dev, &obj->u.vlan);
> + break;
> default:
> err = -EOPNOTSUPP;
> break;
> @@ -473,6 +517,15 @@ static netdev_tx_t dsa_slave_notag_xmit(struct sk_buff *skb,
> return NETDEV_TX_OK;
> }
>
> +static int dsa_slave_vlan_noop(struct net_device *dev, __be16 proto, u16 vid)
> +{
> + /* NETIF_F_HW_VLAN_CTAG_FILTER requires ndo_vlan_rx_add_vid and
> + * ndo_vlan_rx_kill_vid, otherwise the VLAN acceleration is considered
> + * buggy (see net/core/dev.c).
> + */
As Scott mentioned, just don't set NETIF_F_HW_VLAN_CTAG_FILTER.
I don't entirely understand why we would not want to filter VLANs in the switch.
Can you explain ?
Thanks,
Guenter
next prev parent reply other threads:[~2015-06-02 6:52 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 1:27 [RFC 0/9] net: dsa: mv88e6352: add 802.1q VLAN support Vivien Didelot
2015-06-02 1:27 ` [RFC 1/9] net: dsa: add basic support for switchdev obj Vivien Didelot
2015-06-02 1:27 ` [RFC 2/9] net: dsa: add basic support for VLAN operations Vivien Didelot
2015-06-02 6:52 ` Guenter Roeck [this message]
2015-06-02 14:42 ` Guenter Roeck
2015-06-03 0:45 ` Vivien Didelot
2015-06-02 1:27 ` [RFC 3/9] net: dsa: mv88e6xxx: add support for VTU ops Vivien Didelot
2015-06-02 6:50 ` Guenter Roeck
2015-06-02 7:44 ` Scott Feldman
2015-06-02 13:41 ` Guenter Roeck
2015-06-02 13:42 ` Andrew Lunn
2015-06-02 14:47 ` Guenter Roeck
2015-06-02 22:31 ` nolan
2015-06-03 6:53 ` Scott Feldman
2015-06-03 14:44 ` Guenter Roeck
2015-06-03 18:42 ` Florian Fainelli
2015-06-04 18:22 ` nolan
2015-06-03 1:39 ` Vivien Didelot
2015-06-03 2:17 ` Guenter Roeck
2015-06-03 14:56 ` Vivien Didelot
2015-06-03 15:39 ` Guenter Roeck
2015-06-02 13:05 ` Andrew Lunn
2015-06-02 1:27 ` [RFC 4/9] net: dsa: mv88e6352: add support for VLAN Vivien Didelot
2015-06-02 1:27 ` [RFC 5/9] net: dsa: mv88e6352: disable mirroring Vivien Didelot
2015-06-02 14:16 ` Guenter Roeck
2015-06-02 14:53 ` Andrew Lunn
2015-06-03 1:12 ` Vivien Didelot
2015-06-03 2:27 ` Guenter Roeck
2015-06-02 1:27 ` [RFC 6/9] net: dsa: mv88e6352: allow egress of unknown multicast Vivien Didelot
2015-06-02 14:20 ` Guenter Roeck
2015-06-03 1:52 ` Vivien Didelot
2015-06-09 22:42 ` Vivien Didelot
2015-06-02 1:27 ` [RFC 7/9] net: dsa: mv88e6352: lock CPU port from learning addresses Vivien Didelot
2015-06-02 14:24 ` Guenter Roeck
2015-06-03 1:06 ` Vivien Didelot
2015-06-03 2:24 ` Guenter Roeck
[not found] ` <CAFXsbZo7DAhbUErMfKas_KUtXMHTURgOxwz-GSr=fuAHLWToEQ@mail.gmail.com>
2015-06-03 4:17 ` Guenter Roeck
2015-06-03 20:51 ` Andrew Lunn
2015-06-02 1:27 ` [RFC 8/9] net: dsa: mv88e6352: set port 802.1Q mode to Secure Vivien Didelot
2015-06-02 14:31 ` Guenter Roeck
2015-06-02 23:45 ` Vivien Didelot
2015-06-02 23:28 ` Guenter Roeck
2015-06-02 1:27 ` [RFC 9/9] net: dsa: fix EDSA frame from hwaccel frame Vivien Didelot
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=556D52B9.1040004@roeck-us.net \
--to=linux@roeck-us.net \
--cc=andrew@lunn.ch \
--cc=cphealy@gmail.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=jerome.oufella@savoirfairelinux.com \
--cc=jiri@resnulli.us \
--cc=kernel@savoirfairelinux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfeldma@gmail.com \
--cc=vivien.didelot@savoirfairelinux.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).