lkml.org 
[lkml]   [2021]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 net-next 01/11] net: switchdev: propagate extack to port attributes
    Date
    From: Vladimir Oltean <vladimir.oltean@nxp.com>

    When a struct switchdev_attr is notified through switchdev, there is no
    way to report informational messages, unlike for struct switchdev_obj.

    Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
    Reviewed-by: Ido Schimmel <idosch@nvidia.com>
    ---
    Changes in v3:
    None.

    Changes in v2:
    Patch is new.

    .../ethernet/marvell/prestera/prestera_switchdev.c | 3 ++-
    .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 ++-
    drivers/net/ethernet/mscc/ocelot_net.c | 3 ++-
    drivers/net/ethernet/ti/cpsw_switchdev.c | 3 ++-
    include/net/switchdev.h | 6 ++++--
    net/dsa/slave.c | 3 ++-
    net/switchdev/switchdev.c | 11 ++++++++---
    7 files changed, 22 insertions(+), 10 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
    index 8c2b03151736..2c1619715a4b 100644
    --- a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
    +++ b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
    @@ -695,7 +695,8 @@ static int prestera_port_attr_stp_state_set(struct prestera_port *port,
    }

    static int prestera_port_obj_attr_set(struct net_device *dev,
    - const struct switchdev_attr *attr)
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack)
    {
    struct prestera_port *port = netdev_priv(dev);
    int err = 0;
    diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
    index 20c4f3c2cf23..18e4f1cd5587 100644
    --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
    +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
    @@ -887,7 +887,8 @@ mlxsw_sp_port_attr_br_mrouter_set(struct mlxsw_sp_port *mlxsw_sp_port,
    }

    static int mlxsw_sp_port_attr_set(struct net_device *dev,
    - const struct switchdev_attr *attr)
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack)
    {
    struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
    int err;
    diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
    index 8f12fa45b1b5..f9da4aa39444 100644
    --- a/drivers/net/ethernet/mscc/ocelot_net.c
    +++ b/drivers/net/ethernet/mscc/ocelot_net.c
    @@ -1005,7 +1005,8 @@ static void ocelot_port_attr_mc_set(struct ocelot *ocelot, int port, bool mc)
    }

    static int ocelot_port_attr_set(struct net_device *dev,
    - const struct switchdev_attr *attr)
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack)
    {
    struct ocelot_port_private *priv = netdev_priv(dev);
    struct ocelot *ocelot = priv->port.ocelot;
    diff --git a/drivers/net/ethernet/ti/cpsw_switchdev.c b/drivers/net/ethernet/ti/cpsw_switchdev.c
    index 9967cf985728..13524cbaa8b6 100644
    --- a/drivers/net/ethernet/ti/cpsw_switchdev.c
    +++ b/drivers/net/ethernet/ti/cpsw_switchdev.c
    @@ -83,7 +83,8 @@ static int cpsw_port_attr_br_flags_pre_set(struct net_device *netdev,
    }

    static int cpsw_port_attr_set(struct net_device *ndev,
    - const struct switchdev_attr *attr)
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack)
    {
    struct cpsw_priv *priv = netdev_priv(ndev);
    int ret;
    diff --git a/include/net/switchdev.h b/include/net/switchdev.h
    index 88fcac140966..84c765312001 100644
    --- a/include/net/switchdev.h
    +++ b/include/net/switchdev.h
    @@ -283,7 +283,8 @@ int switchdev_handle_port_attr_set(struct net_device *dev,
    struct switchdev_notifier_port_attr_info *port_attr_info,
    bool (*check_cb)(const struct net_device *dev),
    int (*set_cb)(struct net_device *dev,
    - const struct switchdev_attr *attr));
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack));
    #else

    static inline void switchdev_deferred_process(void)
    @@ -374,7 +375,8 @@ switchdev_handle_port_attr_set(struct net_device *dev,
    struct switchdev_notifier_port_attr_info *port_attr_info,
    bool (*check_cb)(const struct net_device *dev),
    int (*set_cb)(struct net_device *dev,
    - const struct switchdev_attr *attr))
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack))
    {
    return 0;
    }
    diff --git a/net/dsa/slave.c b/net/dsa/slave.c
    index 431bdbdd8473..8f4c7c232e2c 100644
    --- a/net/dsa/slave.c
    +++ b/net/dsa/slave.c
    @@ -271,7 +271,8 @@ static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    }

    static int dsa_slave_port_attr_set(struct net_device *dev,
    - const struct switchdev_attr *attr)
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack)
    {
    struct dsa_port *dp = dsa_slave_to_port(dev);
    int ret;
    diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
    index 94113ca29dcf..0b84f076591e 100644
    --- a/net/switchdev/switchdev.c
    +++ b/net/switchdev/switchdev.c
    @@ -488,14 +488,18 @@ static int __switchdev_handle_port_attr_set(struct net_device *dev,
    struct switchdev_notifier_port_attr_info *port_attr_info,
    bool (*check_cb)(const struct net_device *dev),
    int (*set_cb)(struct net_device *dev,
    - const struct switchdev_attr *attr))
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack))
    {
    + struct netlink_ext_ack *extack;
    struct net_device *lower_dev;
    struct list_head *iter;
    int err = -EOPNOTSUPP;

    + extack = switchdev_notifier_info_to_extack(&port_attr_info->info);
    +
    if (check_cb(dev)) {
    - err = set_cb(dev, port_attr_info->attr);
    + err = set_cb(dev, port_attr_info->attr, extack);
    if (err != -EOPNOTSUPP)
    port_attr_info->handled = true;
    return err;
    @@ -525,7 +529,8 @@ int switchdev_handle_port_attr_set(struct net_device *dev,
    struct switchdev_notifier_port_attr_info *port_attr_info,
    bool (*check_cb)(const struct net_device *dev),
    int (*set_cb)(struct net_device *dev,
    - const struct switchdev_attr *attr))
    + const struct switchdev_attr *attr,
    + struct netlink_ext_ack *extack))
    {
    int err;

    --
    2.25.1
    \
     
     \ /
      Last update: 2021-02-10 10:24    [W:3.641 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site