Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1481112 > unrolled thread

[PATCH] net: dsa: add FIB support

Back to article view | Back to linux.kernel

Contents

  [PATCH] net: dsa: add FIB support John Crispin <john@phrozen.org> - 2016-09-12 12:20 +0200
    Re: [PATCH] net: dsa: add FIB support kbuild test robot <lkp@intel.com> - 2016-09-12 13:50 +0200
    Re: [PATCH] net: dsa: add FIB support Andrew Lunn <andrew@lunn.ch> - 2016-09-12 16:10 +0200
      Re: [PATCH] net: dsa: add FIB support John Crispin <john@phrozen.org> - 2016-09-12 20:40 +0200

#1481112 — [PATCH] net: dsa: add FIB support

Add SWITCHDEV_OBJ_ID_IPV4_FIB support to the DSA layer.

Signed-off-by: John Crispin <john@phrozen.org>
---
 Documentation/networking/dsa/dsa.txt |   18 +++++++++++++++
 include/net/dsa.h                    |   13 +++++++++++
 net/dsa/slave.c                      |   41 ++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt
index 6d6c07c..6cd5831 100644
--- a/Documentation/networking/dsa/dsa.txt
+++ b/Documentation/networking/dsa/dsa.txt
@@ -607,6 +607,24 @@ of DSA, would be the its port-based VLAN, used by the associated bridge device.
   function that the driver has to call for each MAC address known to be behind
   the given port. A switchdev object is used to carry the VID and MDB info.
 
+Route offloading
+----------------
+
+- ipv4_fib_prepare: routing layer function invoked to prepare the installation
+  of an ipv4 route into the switches routing database. If the operation is not
+  supported this function should return -EOPNOTSUPP. No hardware setup must be
+  done in this function. See ipv4_fib_add for this and details.
+
+- ipv4_fib_add: routing layer function invoked when a new ipv4 route should be
+  installed into the routing database of the switch, it should be programmed
+  with the route for the specified VLAN ID of the device that the route applies
+  to.
+
+- ipv4_fib_del: routing layer function invoked when an ipv4 route should be
+  removed from the routing database, the switch hardware should be programmed
+  to delete the specified MAC address of the nexthop from the specified VLAN ID
+  if it was mapped into the forwarding database.
+
 TODO
 ====
 
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 7556646..7fdd63e 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -237,6 +237,7 @@ struct switchdev_obj;
 struct switchdev_obj_port_fdb;
 struct switchdev_obj_port_mdb;
 struct switchdev_obj_port_vlan;
+struct switchdev_obj_ipv4_fib;
 
 struct dsa_switch_ops {
 	struct list_head	list;
@@ -386,6 +387,18 @@ struct dsa_switch_ops {
 	int	(*port_mdb_dump)(struct dsa_switch *ds, int port,
 				 struct switchdev_obj_port_mdb *mdb,
 				 int (*cb)(struct switchdev_obj *obj));
+
+	/*
+	 * IPV4 routing
+	 */
+	int	(*ipv4_fib_prepare)(struct dsa_switch *ds, int port,
+				    const struct switchdev_obj_ipv4_fib *fib4,
+				    struct switchdev_trans *trans);
+	int	(*ipv4_fib_add)(struct dsa_switch *ds, int port,
+				const struct switchdev_obj_ipv4_fib *fib4,
+				struct switchdev_trans *trans);
+	int	(*ipv4_fib_del)(struct dsa_switch *ds, int port,
+				const struct switchdev_obj_ipv4_fib *fib4);
 };
 
 void register_switch_driver(struct dsa_switch_ops *type);
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 9ecbe78..9e6ceb2 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -334,6 +334,38 @@ static int dsa_slave_port_mdb_dump(struct net_device *dev,
 	return -EOPNOTSUPP;
 }
 
+static int dsa_slave_ipv4_fib_add(struct net_device *dev,
+				  const struct switchdev_obj_ipv4_fib *fib4,
+				  struct switchdev_trans *trans)
+{
+	struct dsa_slave_priv *p = netdev_priv(dev);
+	struct dsa_switch *ds = p->parent;
+	int ret;
+
+	if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)
+		return -EOPNOTSUPP;
+
+	if (switchdev_trans_ph_prepare(trans))
+		ret = ds->drv->ipv4_fib_prepare(ds, p->port, fib4, trans);
+	else
+		ret = ds->drv->ipv4_fib_add(ds, p->port, fib4, trans);
+
+	return ret;
+}
+
+static int dsa_slave_ipv4_fib_del(struct net_device *dev,
+				  const struct switchdev_obj_ipv4_fib *fib4)
+{
+	struct dsa_slave_priv *p = netdev_priv(dev);
+	struct dsa_switch *ds = p->parent;
+	int ret = -EOPNOTSUPP;
+
+	if (ds->drv->ipv4_fib_del)
+		ret = ds->drv->ipv4_fib_del(ds, p->port, fib4);
+
+	return ret;
+}
+
 static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct dsa_slave_priv *p = netdev_priv(dev);
@@ -465,6 +497,11 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
 					      SWITCHDEV_OBJ_PORT_VLAN(obj),
 					      trans);
 		break;
+	case SWITCHDEV_OBJ_ID_IPV4_FIB:
+		err = dsa_slave_ipv4_fib_add(dev,
+					     SWITCHDEV_OBJ_IPV4_FIB(obj),
+					     trans);
+		break;
 	default:
 		err = -EOPNOTSUPP;
 		break;
@@ -490,6 +527,10 @@ static int dsa_slave_port_obj_del(struct net_device *dev,
 		err = dsa_slave_port_vlan_del(dev,
 					      SWITCHDEV_OBJ_PORT_VLAN(obj));
 		break;
+	case SWITCHDEV_OBJ_ID_IPV4_FIB:
+		err = dsa_slave_ipv4_fib_del(dev,
+					     SWITCHDEV_OBJ_IPV4_FIB(obj));
+		break;
 	default:
 		err = -EOPNOTSUPP;
 		break;
-- 
1.7.10.4

[toc] | [next] | [standalone]

#1481171

[Multipart message — attachments visible in raw view] — view raw

Hi John,

[auto build test ERROR on net-next/master]
[also build test ERROR on next-20160912]
[cannot apply to v4.8-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]

url:    https://github.com/0day-ci/linux/commits/John-Crispin/net-dsa-add-FIB-support/20160912-190416
config: x86_64-randconfig-x006-201637 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   net/dsa/slave.c: In function 'dsa_slave_ipv4_fib_add':
>> net/dsa/slave.c:345:9: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
     if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)
            ^~
   net/dsa/slave.c:345:39: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
     if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)
                                          ^~
   net/dsa/slave.c:349:11: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
      ret = ds->drv->ipv4_fib_prepare(ds, p->port, fib4, trans);
              ^~
   net/dsa/slave.c:351:11: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
      ret = ds->drv->ipv4_fib_add(ds, p->port, fib4, trans);
              ^~
   net/dsa/slave.c: In function 'dsa_slave_ipv4_fib_del':
   net/dsa/slave.c:363:8: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
     if (ds->drv->ipv4_fib_del)
           ^~
   net/dsa/slave.c:364:11: error: 'struct dsa_switch' has no member named 'drv'; did you mean 'dev'?
      ret = ds->drv->ipv4_fib_del(ds, p->port, fib4);
              ^~

vim +345 net/dsa/slave.c

   339					  struct switchdev_trans *trans)
   340	{
   341		struct dsa_slave_priv *p = netdev_priv(dev);
   342		struct dsa_switch *ds = p->parent;
   343		int ret;
   344	
 > 345		if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)
   346			return -EOPNOTSUPP;
   347	
   348		if (switchdev_trans_ph_prepare(trans))

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[toc] | [prev] | [next] | [standalone]

#1481333

Hi John

> +	if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)

drv recently got renamed to ops, which is what 0-day is complaining
about.

	Andrew

[toc] | [prev] | [next] | [standalone]

#1481809

On 12/09/2016 16:00, Andrew Lunn wrote:
> Hi John
> 
>> +	if (!ds->drv->ipv4_fib_prepare || !ds->drv->ipv4_fib_add)
> 
> drv recently got renamed to ops, which is what 0-day is complaining
> about.
> 
> 	Andrew
> 

i based this on a net-next from 5-6 days ago, will rebase/resend tomorrow.

	John

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web