Commit d2e0ef49 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-move-BPF-offload-code-into-app' 



Jakub Kicinski says:

====================
nfp: move BPF offload code into app

This series moves the eBPF offload code out of netdev/vNIC handling and
starts building the nfp_app.  Port init is moved into the apps as well
because various apps associate vNICs, representors with ports differently.

First patch adds a helper for updating tc stats which has been waiting
in my tree to be included in any moderately related series.

Next series will bring communicating with FW using control messages,
then representors, BPF maps, tc flower... :)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c380e377 47eaa23b

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −9
Original line number Diff line number Diff line
@@ -1863,9 +1863,7 @@ int mlx5e_stats_flower(struct mlx5e_priv *priv, 
{

	struct mlx5e_tc_table *tc = &priv->fs.tc;

	struct mlx5e_tc_flow *flow;

	struct tc_action *a;

	struct mlx5_fc *counter;

	LIST_HEAD(actions);

	u64 bytes;

	u64 packets;

	u64 lastuse;
@@ -1884,13 +1882,7 @@ int mlx5e_stats_flower(struct mlx5e_priv *priv, 


	mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);



	preempt_disable();



	tcf_exts_to_list(f->exts, &actions);

	list_for_each_entry(a, &actions, list)

		tcf_action_stats_update(a, bytes, packets, lastuse);



	preempt_enable();

	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);



	return 0;

}

drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

+1 −9
Original line number Diff line number Diff line
@@ -397,8 +397,6 @@ int mlxsw_sp_flower_stats(struct mlxsw_sp_port *mlxsw_sp_port, bool ingress, 
	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_acl_ruleset *ruleset;

	struct mlxsw_sp_acl_rule *rule;

	struct tc_action *a;

	LIST_HEAD(actions);

	u64 packets;

	u64 lastuse;

	u64 bytes;
@@ -419,13 +417,7 @@ int mlxsw_sp_flower_stats(struct mlxsw_sp_port *mlxsw_sp_port, bool ingress, 
	if (err)

		goto err_rule_get_stats;



	preempt_disable();



	tcf_exts_to_list(f->exts, &actions);

	list_for_each_entry(a, &actions, list)

		tcf_action_stats_update(a, bytes, packets, lastuse);



	preempt_enable();

	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);



	mlxsw_sp_acl_ruleset_put(mlxsw_sp, ruleset);

	return 0;

drivers/net/ethernet/netronome/nfp/Makefile

+7 −4
Original line number Diff line number Diff line
@@ -15,20 +15,23 @@ nfp-objs := \ 
	    nfpcore/nfp_rtsym.o \

	    nfpcore/nfp_target.o \

	    nfp_app.o \

	    nfp_app_nic.o \

	    nfp_devlink.o \

	    nfp_hwmon.o \

	    nfp_main.o \

	    nfp_net_common.o \

	    nfp_net_ethtool.o \

	    nfp_net_offload.o \

	    nfp_net_main.o \

	    nfp_netvf_main.o \

	    nfp_port.o

	    nfp_port.o \

	    bpf/main.o \

	    bpf/offload.o \

	    nic/main.o



ifeq ($(CONFIG_BPF_SYSCALL),y)

nfp-objs += \

	    nfp_bpf_verifier.o \

	    nfp_bpf_jit.o

	    bpf/verifier.o \

	    bpf/jit.o

endif



nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o

drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c→drivers/net/ethernet/netronome/nfp/bpf/jit.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <linux/pkt_cls.h>

#include <linux/unistd.h>



#include "nfp_asm.h"

#include "nfp_bpf.h"

#include "main.h"

#include "../nfp_asm.h"



/* --- NFP prog --- */

/* Foreach "multiple" entries macros provide pos and next<n> pointers.

drivers/net/ethernet/netronome/nfp/bpf/main.c

0 → 100644
+160 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



#include <net/pkt_cls.h>



#include "../nfpcore/nfp_cpp.h"

#include "../nfp_app.h"

#include "../nfp_main.h"

#include "../nfp_net.h"

#include "../nfp_port.h"

#include "main.h"



static bool nfp_net_ebpf_capable(struct nfp_net *nn)

{

	if (nn->cap & NFP_NET_CFG_CTRL_BPF &&

	    nn_readb(nn, NFP_NET_CFG_BPF_ABI) == NFP_NET_BPF_ABI)

		return true;

	return false;

}



static int

nfp_bpf_xdp_offload(struct nfp_app *app, struct nfp_net *nn,

		    struct bpf_prog *prog)

{

	struct tc_cls_bpf_offload cmd = {

		.prog = prog,

	};

	int ret;



	if (!nfp_net_ebpf_capable(nn))

		return -EINVAL;



	if (nn->dp.ctrl & NFP_NET_CFG_CTRL_BPF) {

		if (!nn->dp.bpf_offload_xdp)

			return prog ? -EBUSY : 0;

		cmd.command = prog ? TC_CLSBPF_REPLACE : TC_CLSBPF_DESTROY;

	} else {

		if (!prog)

			return 0;

		cmd.command = TC_CLSBPF_ADD;

	}



	ret = nfp_net_bpf_offload(nn, &cmd);

	/* Stop offload if replace not possible */

	if (ret && cmd.command == TC_CLSBPF_REPLACE)

		nfp_bpf_xdp_offload(app, nn, NULL);

	nn->dp.bpf_offload_xdp = prog && !ret;

	return ret;

}



static const char *nfp_bpf_extra_cap(struct nfp_app *app, struct nfp_net *nn)

{

	return nfp_net_ebpf_capable(nn) ? "BPF" : "";

}



static int

nfp_bpf_vnic_init(struct nfp_app *app, struct nfp_net *nn, unsigned int id)

{

	struct nfp_net_bpf_priv *priv;

	int ret;



	/* Limit to single port, otherwise it's just a NIC */

	if (id > 0) {

		nfp_warn(app->cpp,

			 "BPF NIC doesn't support more than one port right now\n");

		nn->port = nfp_port_alloc(app, NFP_PORT_INVALID, nn->dp.netdev);

		return PTR_ERR_OR_ZERO(nn->port);

	}



	priv = kmalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	nn->app_priv = priv;

	spin_lock_init(&priv->rx_filter_lock);

	setup_timer(&priv->rx_filter_stats_timer,

		    nfp_net_filter_stats_timer, (unsigned long)nn);



	ret = nfp_app_nic_vnic_init(app, nn, id);

	if (ret)

		kfree(priv);



	return ret;

}



static void nfp_bpf_vnic_clean(struct nfp_app *app, struct nfp_net *nn)

{

	if (nn->dp.bpf_offload_xdp)

		nfp_bpf_xdp_offload(app, nn, NULL);

	kfree(nn->app_priv);

}



static int nfp_bpf_setup_tc(struct nfp_app *app, struct net_device *netdev,

			    u32 handle, __be16 proto, struct tc_to_netdev *tc)

{

	struct nfp_net *nn = netdev_priv(netdev);



	if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS))

		return -EOPNOTSUPP;

	if (proto != htons(ETH_P_ALL))

		return -EOPNOTSUPP;



	if (tc->type == TC_SETUP_CLSBPF && nfp_net_ebpf_capable(nn)) {

		if (!nn->dp.bpf_offload_xdp)

			return nfp_net_bpf_offload(nn, tc->cls_bpf);

		else

			return -EBUSY;

	}



	return -EINVAL;

}



static bool nfp_bpf_tc_busy(struct nfp_app *app, struct nfp_net *nn)

{

	return nn->dp.ctrl & NFP_NET_CFG_CTRL_BPF;

}



const struct nfp_app_type app_bpf = {

	.id		= NFP_APP_BPF_NIC,

	.name		= "ebpf",



	.extra_cap	= nfp_bpf_extra_cap,



	.vnic_init	= nfp_bpf_vnic_init,

	.vnic_clean	= nfp_bpf_vnic_clean,



	.setup_tc	= nfp_bpf_setup_tc,

	.tc_busy	= nfp_bpf_tc_busy,

	.xdp_offload	= nfp_bpf_xdp_offload,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE