Skip to contentSkip to conversation

propagate extack to vxlan_fdb_delete

PATCH Superseded Alaa Mohamed 3 participants 18 messages Apr 24, 2022 – Apr 25, 2022

Subsystems (6)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v3 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     |  4 +-
 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, 37 insertions(+), 23 deletions(-)
Signature · 1 line
2.36.0
#1 lore raw

PATCH v3 1/2 rtnetlink: add extack support in fdb del handlers

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
fix errors reported by checkpatch.pl

---
 drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
 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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
index d768925785ca..7b55d8d94803 100644
@@ -5678,10 +5678,10 @@ 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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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
index 18ccc3d5d296..95348c1c9ce5 100644
@@ -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
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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);
 

--
2.36.0

#2 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 24 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
fix errors reported by checkpatch.pl

---
 drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
 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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 9 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5678,10 +5678,10 @@ 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;
-
+

What's changed here?

Quoted 94 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
 	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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, · line 783

Quoted 5 lines
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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:
+ struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

Quoted 28 lines
net/bridge/br_private.h +0 -0
 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 -3
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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);
 
--

2.36.0

#3 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 20 lines · Nikolay Aleksandrov
Quoted 19 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
fix errors reported by checkpatch.pl

---
  drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
  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, 12 insertions(+), 12 deletions(-)
Quoted 15 lines
Quoted 5 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 9 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5678,10 +5678,10 @@ 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;
-
+

What's changed here?

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Quoted 103 lines
Quoted 95 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
  	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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, · line 783

Quoted 5 lines
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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, · line 783

Quoted 1 line
net/bridge/br_private.h +1 -0
+		  struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

I will fix it.

Quoted 29 lines
Quoted 29 lines
net/bridge/br_private.h +0 -0
  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 -3
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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);
 
--

2.36.0

#4 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 38 lines · Alaa Mohamed
Quoted 20 lines · Nikolay Aleksandrov
Quoted 19 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
         fix errors reported by checkpatch.pl
---
  drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++-- 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, 12 insertions(+), 12 deletions(-)
Quoted 15 lines
Quoted 12 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644
@@ -5678,10 +5678,10 @@ 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;

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 2 lines
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
-
+

What's changed here?

Quoted 2 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Quoted 136 lines
Quoted 97 lines
Quoted 97 lines

      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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644
@@ -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);
 
Quoted 7 lines

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, · line 783

Quoted 3 lines
net/bridge/br_private.h +1 -1
   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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:
+          struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

I will fix it.

Quoted 29 lines
Quoted 29 lines
net/bridge/br_private.h +0 -0
   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
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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
#5 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 37 lines · Nikolay Aleksandrov
Quoted 36 lines · Alaa Mohamed
Quoted 35 lines · Nikolay Aleksandrov
Quoted 24 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
         fix errors reported by checkpatch.pl

---
   drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
   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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 9 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5678,10 +5678,10 @@ 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;
-
+

What's changed here?

Quoted 4 lines
Quoted 2 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

No, I didn't.

Quoted 3 lines

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Got it, So, what should I do to fix it?

Quoted 133 lines
Quoted 133 lines
Quoted 96 lines
Quoted 96 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
       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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644
@@ -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);
 
Quoted 7 lines

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, · line 783

Quoted 3 lines
net/bridge/br_private.h +1 -1
   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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:
+          struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

I will fix it.

Quoted 28 lines
Quoted 28 lines
net/bridge/br_private.h +0 -0
   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
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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
#6 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 42 lines · Alaa Mohamed
Quoted 40 lines · Nikolay Aleksandrov
Quoted 39 lines · Alaa Mohamed
Quoted 20 lines · Nikolay Aleksandrov
Quoted 19 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
          fix errors reported by checkpatch.pl
---
   drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++-- 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, 12 insertions(+), 12 deletions(-)
Quoted 16 lines
Quoted 13 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644
@@ -5678,10 +5678,10 @@ 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;

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 2 lines
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
-
+

What's changed here?

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Quoted 7 lines
Quoted 2 lines

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

No, I didn't.

Quoted 3 lines

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Got it, So, what should I do to fix it?

Don't change that line? I mean I'm even surprised this made it in the patch. As I mentioned above, there is already a new line there so I'm not sure how you're removing it and adding it again. :)

Cheers,
Nik

#7 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 47 lines · Nikolay Aleksandrov
Quoted 46 lines · Alaa Mohamed
Quoted 38 lines · Nikolay Aleksandrov
Quoted 37 lines · Alaa Mohamed
Quoted 36 lines · Nikolay Aleksandrov
Quoted 32 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
          fix errors reported by checkpatch.pl
---
   drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++-- 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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644
@@ -5678,10 +5678,10 @@ 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;

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 2 lines
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
-
+

What's changed here?

Quoted 4 lines
Quoted 2 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

No, I didn't.

Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Got it, So, what should I do to fix it?

Don't change that line? I mean I'm even surprised this made it in the patch. As I mentioned above, there is already a new line there so I'm not sure how you're removing it and adding it again. :)

Cheers,
 Nik

Thanks Nik, I will fix this.

#8 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

In reply to Alaa Mohamed
Quoted 41 lines · Alaa Mohamed
Quoted 39 lines · Nikolay Aleksandrov
Quoted 38 lines · Alaa Mohamed
Quoted 37 lines · Nikolay Aleksandrov
Quoted 25 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
         fix errors reported by checkpatch.pl

---
   drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
   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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr · line 5685

Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5678,10 +5678,10 @@ 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;
-
+

What's changed here?

Quoted 6 lines
Quoted 5 lines
Quoted 3 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

No, I didn't.

OK, so what is the answer to the question about what changed? It looks like you remove a blank line and then add it back. But that should not show up as a difference when you generate the patch.

When you answer a comment, please put a blank line before and after your answer. Otherwise it can be hard to see your answer when it is in the middle of a larger patch.

Quoted 4 lines
Quoted 3 lines

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Got it, So, what should I do to fix it?

A series? But it is not clear that any change is needed here at all.

julia

Quoted 159 lines
Quoted 157 lines
Quoted 157 lines
Quoted 113 lines
Quoted 113 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
       if (ndm->ndm_state & NUD_PERMANENT) {
           netdev_err(dev, "FDB only supports static addresses\n");

          return -EINVAL;

drivers/net/ethernet/mscc/ocelot_net.c +1 -2
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644
@@ -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);
 
Quoted 11 lines
Quoted 5 lines
net/bridge/br_private.h +1 -1
   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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:
+          struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

I will fix it.

Quoted 31 lines
Quoted 31 lines

  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 +1 -1
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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;

net/core/rtnetlink.c +1 -2
@@ -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);
 
--

2.36.0

#9 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

Quoted 57 lines · Julia Lawall
Quoted 40 lines · Alaa Mohamed
Quoted 39 lines · Nikolay Aleksandrov
Quoted 38 lines · Alaa Mohamed
Quoted 37 lines · Nikolay Aleksandrov
Quoted 25 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
         fix errors reported by checkpatch.pl

---
    drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
    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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr · line 5685

Quoted 10 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
@@ -5678,10 +5678,10 @@ 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;
-
+

What's changed here?

Quoted 6 lines
Quoted 5 lines
Quoted 3 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

Yeah, my question is are you fixing a dos ending or something else? The blank line is already there, what's wrong with it?

No, I didn't.

OK, so what is the answer to the question about what changed? It looks like you remove a blank line and then add it back. But that should not show up as a difference when you generate the patch.

When you answer a comment, please put a blank line before and after your answer. Otherwise it can be hard to see your answer when it is in the middle of a larger patch.

Quoted 6 lines
Quoted 3 lines
Quoted 2 lines

The point is it's not nice to mix style fixes and other changes, more so if nothing is mentioned in the commit message.

Got it, So, what should I do to fix it?

A series? But it is not clear that any change is needed here at all.

julia

I understood but I mean how to create the patch without this but I will google it , Thanks Julia.

Quoted 159 lines
Quoted 159 lines
Quoted 158 lines
Quoted 158 lines
Quoted 114 lines
Quoted 114 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
        if (ndm->ndm_state & NUD_PERMANENT) {
            netdev_err(dev, "FDB only supports static addresses\n");

          return -EINVAL;

drivers/net/ethernet/mscc/ocelot_net.c +1 -2
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644
@@ -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);
 
Quoted 11 lines
Quoted 5 lines
net/bridge/br_private.h +1 -1
    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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:
+          struct net_device *dev, const unsigned char *addr, u16 vid, struct netlink_ext_ack *extack);

I will fix it.

Quoted 31 lines
Quoted 31 lines

  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 +1 -1
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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;

net/core/rtnetlink.c +1 -2
@@ -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);
 
--

2.36.0

#10 lore raw

Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers

In reply to Alaa Mohamed
Quoted 40 lines · Alaa Mohamed
Quoted 29 lines · Nikolay Aleksandrov
Quoted 28 lines · Alaa Mohamed

Add extack support to .ndo_fdb_del in netdevice.h and all related methods.

---
changes in V3:
fix errors reported by checkpatch.pl

---
  drivers/net/ethernet/intel/ice/ice_main.c        | 4 ++--
  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, 12 insertions(+), 12 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
index d768925785ca..7b55d8d94803 100644
@@ -5678,10 +5678,10 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr
 __always_unused *tb[],
  static int
  ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],
Quoted 8 lines

drivers/net/ethernet/intel/ice/ice_main.c ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], · line 5684

Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
  	    struct net_device *dev, const unsigned char *addr,
-	    __always_unused u16 vid)
+	    __always_unused u16 vid, struct netlink_ext_ack *extack)
  {
  	int err;
-
+

What's changed here?

Quoted 2 lines

In the previous version, I removed the blank line after "int err;" and you said I shouldn't so I added blank line.

This answer doesn't make sense. You should make a patch against the code as it is in the kernel, not against your previous proposal.

julia

Quoted 160 lines
Quoted 121 lines
Quoted 109 lines
drivers/net/ethernet/intel/ice/ice_main.c +0 -0
  	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
index 247bc105bdd2..e07c64e3159c 100644
@@ -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
index d320567b2cca..51fa23418f6a 100644
@@ -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
index 069e8824c264..ffd34d9f7049 100644
@@ -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
index de97ff98d36e..cf2f60037340 100644
@@ -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
index 28ea4f8269d4..d0d2a8f33c73 100644
@@ -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
index 6ccda68bd473..5bfce2e9a553 100644
@@ -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 +0 -0
index 18ccc3d5d296..95348c1c9ce5 100644

net/bridge/br_private.h void br_fdb_update(struct net_bridge *br, struct · line 785

Quoted 7 lines
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);

This is way too long (111 chars) and checkpatch should've complained about it.
WARNING: line length of 111 exceeds 100 columns
#234: FILE: net/bridge/br_private.h:782:

(quoted diff) +1 -0
+		  struct net_device *dev, const unsigned char *addr, u16 vid,
Quoted 1 line

struct netlink_ext_ack *extack);

I will fix it.

Quoted 33 lines
Quoted 33 lines
net/bridge/br_private.h +0 -0
  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 +1 -1
index 4041b3e2e8ec..99b30ae58a47 100644
@@ -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;

net/core/rtnetlink.c +1 -2
@@ -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);
 
--

2.36.0

#11 lore raw

PATCH v3 2/2 net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

In reply to Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
---
changes in V3:
fix errors reported by checkpatch.pl

---
 drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +25 -11
index cf2f60037340..4e1886655101 100644
@@ -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;
 

--
2.36.0

#12 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 10 lines

---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
---
changes in V3:
fix errors reported by checkpatch.pl

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

julia

Quoted 112 lines
---
 drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +25 -12
index cf2f60037340..4e1886655101 100644
@@ -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;
 
--

2.36.0

#13 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

Quoted 15 lines · Julia Lawall
Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 9 lines

---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
---
changes in V3:
fix errors reported by checkpatch.pl

Quoted 3 lines

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

I ran checkpatch script before submitting this patch and got no error

Quoted 115 lines

julia

Quoted 112 lines
---
  drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++-----------
  1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +25 -12
index cf2f60037340..4e1886655101 100644
@@ -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;
 
--

2.36.0

#14 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

Quoted 17 lines · Alaa Mohamed
Quoted 15 lines · Julia Lawall
Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 9 lines

---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
---
changes in V3:
fix errors reported by checkpatch.pl

Quoted 4 lines
Quoted 3 lines

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

I ran checkpatch script before submitting this patch and got no error

OK, whether checkpatch complains or not doesn't really matter. The point is that in the Linux kernel, one writes:

if (...) {

and not

if (...){

You can see other examples of ifs in the Linux kernel.

julia

Quoted 125 lines
Quoted 124 lines

julia

Quoted 121 lines
---
  drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++-----------
  1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +17 -7
index cf2f60037340..4e1886655101 100644
@@ -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;
drivers/net/vxlan/vxlan_core.c +6 -2
@@ -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;
  	}
drivers/net/vxlan/vxlan_core.c +2 -3
@@ -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;
 
--

2.36.0

#15 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

Quoted 25 lines · Julia Lawall
Quoted 15 lines · Alaa Mohamed
Quoted 14 lines · Julia Lawall
Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 9 lines

---
changes in V2:
- fix spelling vxlan_fdb_delete
- add missing braces
- edit error message
---
changes in V3:
fix errors reported by checkpatch.pl

Quoted 4 lines
Quoted 3 lines

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

I ran checkpatch script before submitting this patch and got no error

OK, whether checkpatch complains or not doesn't really matter. The point is that in the Linux kernel, one writes:

Quoted 7 lines

if (...) {

and not

if (...){

You can see other examples of ifs in the Linux kernel.

Yes, got it. I will fix it.

Thanks,

Alaa

Quoted 127 lines

julia

Quoted 124 lines
Quoted 123 lines

julia

Quoted 121 lines
---
   drivers/net/vxlan/vxlan_core.c | 36 +++++++++++++++++++++++-----------
   1 file changed, 25 insertions(+), 11 deletions(-)
drivers/net/vxlan/vxlan_core.c +17 -7
index cf2f60037340..4e1886655101 100644
@@ -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;
drivers/net/vxlan/vxlan_core.c +6 -2
@@ -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;
   	}
drivers/net/vxlan/vxlan_core.c +2 -3
@@ -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;
 
--

2.36.0

#16 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

In reply to Alaa Mohamed
Quoted 17 lines · Alaa Mohamed
Quoted 15 lines · Julia Lawall
Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 9 lines

---
changes in V2:
    - fix spelling vxlan_fdb_delete
    - add missing braces
    - edit error message
---
changes in V3:
    fix errors reported by checkpatch.pl

Quoted 4 lines
Quoted 3 lines

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

I ran checkpatch script before submitting this patch and got no error

This is what I got:
WARNING: suspect code indent for conditional statements (8, 24) #366: FILE: drivers/net/vxlan/vxlan_core.c:1137:
if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] ||
[...]
+ NL_SET_ERR_MSG(extack, "DST, VNI, ifindex and port are mutually exclusive with NH_ID");

WARNING: line length of 111 exceeds 100 columns
#370: FILE: drivers/net/vxlan/vxlan_core.c:1139:
+ NL_SET_ERR_MSG(extack, "DST, VNI, ifindex and port are mutually exclusive with NH_ID");

ERROR: space required before the open brace '{'
#377: FILE: drivers/net/vxlan/vxlan_core.c:1145:
+ if (err){

ERROR: space required before the open brace '{'
#389: FILE: drivers/net/vxlan/vxlan_core.c:1164:
+ if (nla_len(tb[NDA_PORT]) != sizeof(__be16)){

ERROR: space required before the open brace '{'
#400: FILE: drivers/net/vxlan/vxlan_core.c:1174:
+ if (nla_len(tb[NDA_VNI]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#411: FILE: drivers/net/vxlan/vxlan_core.c:1184:
+ if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#423: FILE: drivers/net/vxlan/vxlan_core.c:1196:
+ if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#430: FILE: drivers/net/vxlan/vxlan_core.c:1202:
+ if (!tdev){

ERROR: space required after that ',' (ctx:VxV)
#431: FILE: drivers/net/vxlan/vxlan_core.c:1203:
+ NL_SET_ERR_MSG(extack,"Device not found");

#17 lore raw

Re: [PATCH net-next v3 2/2] net: vxlan: vxlan_core.c: Add extack support to vxlan_fdb_delete

Quoted 59 lines · Nikolay Aleksandrov
Quoted 15 lines · Alaa Mohamed
Quoted 14 lines · Julia Lawall
Quoted 1 line · Alaa Mohamed

Add extack to vxlan_fdb_delete and vxlan_fdb_parse

It could be helpful to say more about what adding extack support involves.

Quoted 9 lines

---
changes in V2:
    - fix spelling vxlan_fdb_delete
    - add missing braces
    - edit error message
---
changes in V3:
    fix errors reported by checkpatch.pl

Quoted 4 lines
Quoted 3 lines

But your changes would seem to also be introducing more checkpatch errors, because the Linux kernel coding style puts a space before an { at the start of an if branch.

I ran checkpatch script before submitting this patch and got no error

This is what I got:
WARNING: suspect code indent for conditional statements (8, 24) #366: FILE: drivers/net/vxlan/vxlan_core.c:1137:
if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] ||
[...]

drivers/net/vxlan/vxlan_core.c +1 -0
+			NL_SET_ERR_MSG(extack, "DST, VNI, ifindex and port are mutually exclusive with NH_ID");

WARNING: line length of 111 exceeds 100 columns
#370: FILE: drivers/net/vxlan/vxlan_core.c:1139:

drivers/net/vxlan/vxlan_core.c +1 -0
+			NL_SET_ERR_MSG(extack, "DST, VNI, ifindex and port are mutually exclusive with NH_ID");

ERROR: space required before the open brace '{'
#377: FILE: drivers/net/vxlan/vxlan_core.c:1145:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (err){

ERROR: space required before the open brace '{'
#389: FILE: drivers/net/vxlan/vxlan_core.c:1164:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (nla_len(tb[NDA_PORT]) != sizeof(__be16)){

ERROR: space required before the open brace '{'
#400: FILE: drivers/net/vxlan/vxlan_core.c:1174:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (nla_len(tb[NDA_VNI]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#411: FILE: drivers/net/vxlan/vxlan_core.c:1184:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#423: FILE: drivers/net/vxlan/vxlan_core.c:1196:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)){

ERROR: space required before the open brace '{'
#430: FILE: drivers/net/vxlan/vxlan_core.c:1202:

drivers/net/vxlan/vxlan_core.c +1 -0
+		if (!tdev){

ERROR: space required after that ',' (ctx:VxV)
#431: FILE: drivers/net/vxlan/vxlan_core.c:1203:

drivers/net/vxlan/vxlan_core.c static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, · line 1203

Quoted 1 line
drivers/net/vxlan/vxlan_core.c +1 -0
+			NL_SET_ERR_MSG(extack,"Device not found");

Thank you for sending that , but I don't know why I missed that when I ran the script. Anyway, I fixed all these errors as Julia said.

Thanks again,

Alaa