propagate extack to vxlan_fdb_delete
Subsystems (6)
v2 cover propagate extack to vxlan_fdb_delete
In order to propagate extack to vxlan_fdb_delete and vxlan_fdb_parse, add extack to .ndo_fdb_del and edit all fdb del handelers
Alaa Mohamed (2):
rtnetlink: add extack support in fdb del handlers
net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete
drivers/net/ethernet/intel/ice/ice_main.c | 3 +- drivers/net/ethernet/mscc/ocelot_net.c | 4 +- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- drivers/net/macvlan.c | 2 +- drivers/net/vxlan/vxlan_core.c | 38 +++++++++++++------ include/linux/netdevice.h | 2 +- net/bridge/br_fdb.c | 2 +- net/bridge/br_private.h | 2 +- net/core/rtnetlink.c | 4 +- 9 files changed, 36 insertions(+), 23 deletions(-)
Signature · 1 line
2.36.0
PATCH v2 1/2 rtnetlink: add extack support in fdb del handlers
Add extack support to .ndo_fdb_del in netdevice.h and all related methods.
--- drivers/net/ethernet/intel/ice/ice_main.c | 3 +-- drivers/net/ethernet/mscc/ocelot_net.c | 4 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- drivers/net/macvlan.c | 2 +- drivers/net/vxlan/vxlan_core.c | 2 +- include/linux/netdevice.h | 2 +- net/bridge/br_fdb.c | 2 +- net/bridge/br_private.h | 2 +- net/core/rtnetlink.c | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -2
@@ -5678,10 +5678,9 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],static int ice_fdb_del (struct ndmsg *ndm,__always_unused struct nlattr *tb[],struct net_device *dev,const unsigned char *addr, -__always_unused u16 vid) +__always_unused u16 vid,struct netlink_ext_ack *extack) {int err; -if (ndm->ndm_state &NUD_PERMANENT ) {netdev_err (dev,"FDB only supports static addresses\n" );return -EINVAL ;
drivers/net/ethernet/mscc/ocelot_net.c +2 -2
@@ -774,14 +774,14 @@ static int ocelot_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],static int ocelot_port_fdb_del (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 vid) +const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack) {struct ocelot_port_private *priv =netdev_priv (dev);struct ocelot_port *ocelot_port = &priv->port;struct ocelot *ocelot = ocelot_port->ocelot;int port = priv->chip_port; -return ocelot_fdb_del (ocelot, port, addr, vid, ocelot_port->bridge); +return ocelot_fdb_del (ocelot, port, addr, vid, ocelot_port->bridge, extack); } static int ocelot_port_fdb_dump(struct sk_buff *skb,
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -1
@@ -368,7 +368,7 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)static int qlcnic_fdb_del (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *netdev, -const unsigned char *addr,u16 vid) +const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack) {struct qlcnic_adapter *adapter =netdev_priv (netdev);int err = -EOPNOTSUPP ;
drivers/net/macvlan.c +1 -1
@@ -1017,7 +1017,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],static int macvlan_fdb_del (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 vid) +const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack) {struct macvlan_dev *vlan =netdev_priv (dev);int err = -EINVAL ;
drivers/net/vxlan/vxlan_core.c +1 -1
@@ -1280,7 +1280,7 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan,/* Delete entry (via netlink) */ static int vxlan_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 vid) +const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack) {struct vxlan_dev *vxlan =netdev_priv (dev);union vxlan_addr ip;
include/linux/netdevice.h +1 -1
@@ -1509,7 +1509,7 @@ struct net_device_ops {struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, - u16 vid); + u16 vid, struct netlink_ext_ack *extack); int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb, struct net_device *dev,
net/bridge/br_fdb.c +1 -1
@@ -1110,7 +1110,7 @@ static int __br_fdb_delete(struct net_bridge *br,/* Remove neighbor entry with RTM_DELNEIGH */ int br_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 vid) +const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack) {struct net_bridge_vlan_group *vg;struct net_bridge_port *p =NULL ;
net/bridge/br_private.h +1 -1
@@ -780,7 +780,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid, unsigned long flags);int br_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[], -struct net_device *dev,const unsigned char *addr,u16 vid); +struct net_device *dev,const unsigned char *addr,u16 vid,struct netlink_ext_ack *extack);int br_fdb_add (struct ndmsg *nlh,struct nlattr *tb[],struct net_device *dev,const unsigned char *addr,u16 vid,u16 nlh_flags,struct netlink_ext_ack *extack);
net/core/rtnetlink.c +2 -2
@@ -4223,7 +4223,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,const struct net_device_ops *ops = br_dev->netdev_ops;if (ops->ndo_fdb_del) - err = ops->ndo_fdb_del (ndm, tb, dev, addr, vid); + err = ops->ndo_fdb_del (ndm, tb, dev, addr, vid, extack);if (err) goto out;
@@ -4235,7 +4235,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,if (ndm->ndm_flags &NTF_SELF ) {if (dev->netdev_ops->ndo_fdb_del) err = dev->netdev_ops->ndo_fdb_del (ndm, tb, dev, addr, - vid); + vid, extack);else err =ndo_dflt_fdb_del (ndm, tb, dev, addr, vid);
Signature · 1 line
2.36.0
PATCH v2 2/2 net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete
In reply to Alaa MohamedAdd extack to vxlan_fdb_delete and vxlan_fdb_parse
---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
--- drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +25 -11
@@ -1129,19 +1129,23 @@ static void vxlan_fdb_dst_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f,static int vxlan_fdb_parse (struct nlattr *tb[],struct vxlan_dev *vxlan,union vxlan_addr *ip,__be16 *port,__be32 *src_vni, -__be32 *vni,u32 *ifindex,u32 *nhid) +__be32 *vni,u32 *ifindex,u32 *nhid,struct netlink_ext_ack *extack) {struct net *net =dev_net (vxlan->dev);int err;if (tb[NDA_NH_ID ] && (tb[NDA_DST ] || tb[NDA_VNI ] || tb[NDA_IFINDEX ] || - tb[NDA_PORT ])) -return -EINVAL ; + tb[NDA_PORT ])){ +NL_SET_ERR_MSG (extack,"DST, VNI, ifindex and port are mutually exclusive with NH_ID" ); +return -EINVAL ; + }if (tb[NDA_DST ]) { err =vxlan_nla_get_addr (ip, tb[NDA_DST ]); -if (err) +if (err){ +NL_SET_ERR_MSG (extack,"Unsupported address family" );return err; + } }else {union vxlan_addr *remote = &vxlan->default_dst.remote_ip;
@@ -1157,24 +1161,30 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, }if (tb[NDA_PORT ]) { -if (nla_len (tb[NDA_PORT ]) !=sizeof (__be16)) +if (nla_len (tb[NDA_PORT ]) !=sizeof (__be16)){ +NL_SET_ERR_MSG (extack,"Invalid vxlan port" );return -EINVAL ; + } *port =nla_get_be16 (tb[NDA_PORT ]); }else { *port = vxlan->cfg.dst_port; }if (tb[NDA_VNI ]) { -if (nla_len (tb[NDA_VNI ]) !=sizeof (u32)) +if (nla_len (tb[NDA_VNI ]) !=sizeof (u32)){ +NL_SET_ERR_MSG (extack,"Invalid vni" );return -EINVAL ; + } *vni =cpu_to_be32 (nla_get_u32 (tb[NDA_VNI ])); }else { *vni = vxlan->default_dst.remote_vni; }if (tb[NDA_SRC_VNI ]) { -if (nla_len (tb[NDA_SRC_VNI ]) !=sizeof (u32)) +if (nla_len (tb[NDA_SRC_VNI ]) !=sizeof (u32)){ +NL_SET_ERR_MSG (extack,"Invalid src vni" );return -EINVAL ; + } *src_vni =cpu_to_be32 (nla_get_u32 (tb[NDA_SRC_VNI ])); }else { *src_vni = vxlan->default_dst.remote_vni;
@@ -1183,12 +1193,16 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,if (tb[NDA_IFINDEX ]) {struct net_device *tdev; -if (nla_len (tb[NDA_IFINDEX ]) !=sizeof (u32)) +if (nla_len (tb[NDA_IFINDEX ]) !=sizeof (u32)){ +NL_SET_ERR_MSG (extack,"Invalid ifindex" );return -EINVAL ; + } *ifindex =nla_get_u32 (tb[NDA_IFINDEX ]); tdev =__dev_get_by_index (net, *ifindex); -if (!tdev) +if (!tdev){ +NL_SET_ERR_MSG (extack,"Device not found" );return -EADDRNOTAVAIL ; + } }else { *ifindex =0 ; }
@@ -1226,7 +1240,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],return -EINVAL ; err =vxlan_fdb_parse (tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex, - &nhid); + &nhid, extack);if (err)return err;
@@ -1291,7 +1305,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],int err; err =vxlan_fdb_parse (tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex, - &nhid); + &nhid, extack);if (err)return err;
Signature · 1 line
2.36.0
Nikolay Aleksandrov
maintainerRe: [PATCH net-next v2 1/2] rtnetlink: add extack support in fdb del handlers
In reply to Alaa MohamedQuoted 5 lines · Alaa Mohamed
Add extack support to .ndo_fdb_del in
netdevice.hand all related methods.Signed-off-by Alaa Mohamed <[email protected]>---
Please CC all patch-related maintainers next time. One comment below.
Quoted 16 lines
drivers/net/ethernet/intel/ice/ice_main.c | 3 +-- drivers/net/ethernet/mscc/ocelot_net.c | 4 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- drivers/net/macvlan.c | 2 +- drivers/net/vxlan/vxlan_core.c | 2 +- include/linux/netdevice.h | 2 +- net/bridge/br_fdb.c | 2 +- net/bridge/br_private.h | 2 +- net/core/rtnetlink.c | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-)drivers/net/ethernet/intel/ice/ice_main.c +0
-0
drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684
Quoted 8 lines
drivers/net/ethernet/intel/ice/ice_main.c +1
-2@@ -5678,10 +5678,9 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],static int ice_fdb_del (struct ndmsg *ndm,__always_unused struct nlattr *tb[],struct net_device *dev,const unsigned char *addr, -__always_unused u16 vid) +__always_unused u16 vid,struct netlink_ext_ack *extack) {int err; -
I don't think you should remove this new line.
Quoted 3 lines
drivers/net/ethernet/intel/ice/ice_main.c +0
-0if (ndm->ndm_state &NUD_PERMANENT ) {netdev_err (dev,"FDB only supports static addresses\n" );return -EINVAL ;
Re: [PATCH net-next v2 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete
In reply to Alaa Mohameddrivers/net/vxlan/vxlan_core.c static void vxlan_fdb_dst_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f, · line 1140
Quoted 2 lines · On Sun, 24 Apr 2022 00:54:08 +0200 Alaa Mohamed…
drivers/net/vxlan/vxlan_core.c +2
-0+NL_SET_ERR_MSG (extack,"DST, VNI, ifindex and port are mutually exclusive with NH_ID" ); +return -EINVAL ;
why not break the line after "NL_SET_ERR_MSG(extack," so it is no so long?