Re: [PATCH/RFC net-next 3/9] nfp: provide infrastructure for offloading flower based TC filters

2017-06-28 Thread Simon Horman 
On Tue, Jun 27, 2017 at 11:13:06PM -0700, Jakub Kicinski wrote:
> On Wed, 28 Jun 2017 01:21:43 +0200, Simon Horman wrote:
> > From: Pieter Jansen van Vuuren 
> > 
> > Adds a flower based TC offload handler for representor devices, this
> > is in addition to the bpf based offload handler. The changes in this
> > patch will be used in a follow-up patch to add tc flower offload to
> > the NFP.
> > 
> > The flower app enables tc offloads on representors by default.
> > 
> > Signed-off-by: Pieter Jansen van Vuuren 
> > 
> > Signed-off-by: Simon Horman 
> 
> > diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c 
> > b/drivers/net/ethernet/netronome/nfp/flower/main.c
> > index ab68a8f58862..7b27871f489c 100644
> > --- a/drivers/net/ethernet/netronome/nfp/flower/main.c
> > +++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
> > @@ -37,6 +37,7 @@
> >  #include 
> >  #include 
> >  
> > +#include "main.h"
> >  #include "../nfpcore/nfp_cpp.h"
> >  #include "../nfpcore/nfp_nsp.h"
> >  #include "../nfp_app.h"
> > @@ -303,8 +304,14 @@ static int nfp_flower_vnic_init(struct nfp_app *app, 
> > struct nfp_net *nn,
> > eth_hw_addr_random(nn->dp.netdev);
> > netif_keep_dst(nn->dp.netdev);
> >  
> > +   if (nfp_flower_repr_init(app))
> > +   goto err_free_priv;
> 
> Please make the contents of nfp_flower_repr_init() part of app's .init
> callback.

Thanks, I will fix this up and other comments relating to
nfp_flower_repr_init()

> > return 0;
> >  
> > +err_free_priv:
> > +   kfree(app->priv);
> > +   app->priv = NULL;
> 
> This doesn't belong here after my recent series.  priv init was moved
> to app's init callback.
> 
> >  err_invalid_port:
> > nn->port = nfp_port_alloc(app, NFP_PORT_INVALID, nn->dp.netdev);
> > return PTR_ERR_OR_ZERO(nn->port);
> 
> > +int nfp_flower_repr_init(struct nfp_app *app)
> > +{
> > +   u64 version;
> > +   int err;
> > +
> > +   version = nfp_rtsym_read_le(app->pf->rtbl, "hw_flower_version", );
> > +   if (err)
> > +   return -EINVAL;
> 
> Nit: this could return err directly.  Also I think it's worth printing
> an error message.
> 
> > +   /* We need to ensure hardware has enough flower capabilities. */
> > +   if (version != NFP_FLOWER_ALLOWED_VER)
> > +   return -EINVAL;
> 
> Here we should definitely tell the user what went wrong.
> 
> > +   return 0;
> > +}
> 
> > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c 
> > b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> > index bc9108071e5b..a73b311c1f75 100644
> > --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> > +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> > @@ -250,6 +250,18 @@ static int nfp_repr_open(struct net_device *netdev)
> > return nfp_app_repr_open(repr->app, repr);
> >  }
> >  
> > +static int
> > +nfp_repr_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index,
> > + __be16 proto, struct tc_to_netdev *tc)
> > +{
> > +   struct nfp_repr *repr = netdev_priv(netdev);
> > +
> > +   if (chain_index)
> > +   return -EOPNOTSUPP;
> > +
> > +   return nfp_app_setup_tc(repr->app, netdev, handle, proto, tc);
> > +}
> 
> Just a reminder that this could be a nfp_port function.

Sure, will do.

Re: [PATCH/RFC net-next 3/9] nfp: provide infrastructure for offloading flower based TC filters

2017-06-28 Thread Jakub Kicinski 
On Wed, 28 Jun 2017 01:21:43 +0200, Simon Horman wrote:
> From: Pieter Jansen van Vuuren 
> 
> Adds a flower based TC offload handler for representor devices, this
> is in addition to the bpf based offload handler. The changes in this
> patch will be used in a follow-up patch to add tc flower offload to
> the NFP.
> 
> The flower app enables tc offloads on representors by default.
> 
> Signed-off-by: Pieter Jansen van Vuuren 
> Signed-off-by: Simon Horman 

> diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c 
> b/drivers/net/ethernet/netronome/nfp/flower/main.c
> index ab68a8f58862..7b27871f489c 100644
> --- a/drivers/net/ethernet/netronome/nfp/flower/main.c
> +++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
> @@ -37,6 +37,7 @@
>  #include 
>  #include 
>  
> +#include "main.h"
>  #include "../nfpcore/nfp_cpp.h"
>  #include "../nfpcore/nfp_nsp.h"
>  #include "../nfp_app.h"
> @@ -303,8 +304,14 @@ static int nfp_flower_vnic_init(struct nfp_app *app, 
> struct nfp_net *nn,
>   eth_hw_addr_random(nn->dp.netdev);
>   netif_keep_dst(nn->dp.netdev);
>  
> + if (nfp_flower_repr_init(app))
> + goto err_free_priv;

Please make the contents of nfp_flower_repr_init() part of app's .init
callback.

>   return 0;
>  
> +err_free_priv:
> + kfree(app->priv);
> + app->priv = NULL;

This doesn't belong here after my recent series.  priv init was moved
to app's init callback.

>  err_invalid_port:
>   nn->port = nfp_port_alloc(app, NFP_PORT_INVALID, nn->dp.netdev);
>   return PTR_ERR_OR_ZERO(nn->port);

> +int nfp_flower_repr_init(struct nfp_app *app)
> +{
> + u64 version;
> + int err;
> +
> + version = nfp_rtsym_read_le(app->pf->rtbl, "hw_flower_version", );
> + if (err)
> + return -EINVAL;

Nit: this could return err directly.  Also I think it's worth printing
an error message.

> + /* We need to ensure hardware has enough flower capabilities. */
> + if (version != NFP_FLOWER_ALLOWED_VER)
> + return -EINVAL;

Here we should definitely tell the user what went wrong.

> + return 0;
> +}

> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c 
> b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> index bc9108071e5b..a73b311c1f75 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
> @@ -250,6 +250,18 @@ static int nfp_repr_open(struct net_device *netdev)
>   return nfp_app_repr_open(repr->app, repr);
>  }
>  
> +static int
> +nfp_repr_setup_tc(struct net_device *netdev, u32 handle, u32 chain_index,
> +   __be16 proto, struct tc_to_netdev *tc)
> +{
> + struct nfp_repr *repr = netdev_priv(netdev);
> +
> + if (chain_index)
> + return -EOPNOTSUPP;
> +
> + return nfp_app_setup_tc(repr->app, netdev, handle, proto, tc);
> +}

Just a reminder that this could be a nfp_port function.

[PATCH/RFC net-next 3/9] nfp: provide infrastructure for offloading flower based TC filters

2017-06-27 Thread Simon Horman 
From: Pieter Jansen van Vuuren 

Adds a flower based TC offload handler for representor devices, this
is in addition to the bpf based offload handler. The changes in this
patch will be used in a follow-up patch to add tc flower offload to
the NFP.

The flower app enables tc offloads on representors by default.

Signed-off-by: Pieter Jansen van Vuuren 
Signed-off-by: Simon Horman 
---
 drivers/net/ethernet/netronome/nfp/Makefile|   3 +-
 drivers/net/ethernet/netronome/nfp/flower/main.c   |   9 ++
 drivers/net/ethernet/netronome/nfp/flower/main.h   |  48 +++
 .../net/ethernet/netronome/nfp/flower/offload.c| 144 +
 drivers/net/ethernet/netronome/nfp/nfp_net_repr.c  |  18 +++
 5 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/ethernet/netronome/nfp/flower/main.h
 create mode 100644 drivers/net/ethernet/netronome/nfp/flower/offload.c

diff --git a/drivers/net/ethernet/netronome/nfp/Makefile 
b/drivers/net/ethernet/netronome/nfp/Makefile
index 43bdbc228969..d7afd2b410fe 100644
--- a/drivers/net/ethernet/netronome/nfp/Makefile
+++ b/drivers/net/ethernet/netronome/nfp/Makefile
@@ -32,7 +32,8 @@ nfp-objs := \
 ifeq ($(CONFIG_NFP_APP_FLOWER),y)
 nfp-objs += \
flower/cmsg.o \
-   flower/main.o
+   flower/main.o \
+   flower/offload.o
 endif
 
 ifeq ($(CONFIG_BPF_SYSCALL),y)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c 
b/drivers/net/ethernet/netronome/nfp/flower/main.c
index ab68a8f58862..7b27871f489c 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -37,6 +37,7 @@
 #include 
 #include 
 
+#include "main.h"
 #include "../nfpcore/nfp_cpp.h"
 #include "../nfpcore/nfp_nsp.h"
 #include "../nfp_app.h"
@@ -303,8 +304,14 @@ static int nfp_flower_vnic_init(struct nfp_app *app, 
struct nfp_net *nn,
eth_hw_addr_random(nn->dp.netdev);
netif_keep_dst(nn->dp.netdev);
 
+   if (nfp_flower_repr_init(app))
+   goto err_free_priv;
+
return 0;
 
+err_free_priv:
+   kfree(app->priv);
+   app->priv = NULL;
 err_invalid_port:
nn->port = nfp_port_alloc(app, NFP_PORT_INVALID, nn->dp.netdev);
return PTR_ERR_OR_ZERO(nn->port);
@@ -367,4 +374,6 @@ const struct nfp_app_type app_flower = {
 
.eswitch_mode_get  = eswitch_mode_get,
.repr_get   = nfp_flower_repr_get,
+
+   .setup_tc   = nfp_flower_setup_tc,
 };
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h 
b/drivers/net/ethernet/netronome/nfp/flower/main.h
new file mode 100644
index ..119f66068c2b
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 Netronome Systems, Inc.
+ *
+ * This software is dual licensed under the GNU General License Version 2,
+ * June 1991 as shown in the file COPYING in the top-level directory of this
+ * source tree or the BSD 2-Clause License provided below.  You have the
+ * option to license this software under the complete terms of either license.
+ *
+ * The BSD 2-Clause License:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef __NFP_FLOWER_H__
+#define __NFP_FLOWER_H__ 1
+
+#include 
+
+#define NFP_FLOWER_ALLOWED_VER 0x00010001UL
+
+struct tc_to_netdev;
+struct net_device;
+struct nfp_app;
+
+int nfp_flower_repr_init(struct nfp_app *app);
+int nfp_flower_setup_tc(struct nfp_app *app, struct net_device *netdev,
+   u32 handle, __be16 proto, struct tc_to_netdev *tc);
+#endif
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c 
b/drivers/net/ethernet/netronome/nfp/flower/offload.c
new file mode 100644
index ..9127c28ea9c3
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -0,0 +1,144 @@