Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'nfp-abm-add-basic-support-for-advanced-buffering-NIC' 



Jakub Kicinski says:

====================
nfp: abm: add basic support for advanced buffering NIC

This series lays groundwork for advanced buffer management NIC feature.
It makes necessary NFP core changes, spawns representors and adds devlink
glue.  Following series will add the actual buffering configuration (patch
series size limit).

First three patches add support for configuring NFP buffer pools via a
mailbox.  The existing devlink APIs are used for the purpose.

Third patch allows us to perform small reads from the NFP memory.

The rest of the patch set adds eswitch mode change support and makes
the driver spawn appropriate representors.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e95a5f54 51c1df83

drivers/net/ethernet/netronome/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -36,6 +36,19 @@ config NFP_APP_FLOWER 
	  either directly, with Open vSwitch, or any other way.  Note that

	  TC Flower offload requires specific FW to work.



config NFP_APP_ABM_NIC

	bool "NFP4000/NFP6000 Advanced buffer management NIC support"

	depends on NFP

	depends on NET_SWITCHDEV

	default y

	help

	  Enable driver support for Advanced buffer management NIC on NFP.

	  ABM NIC allows advanced configuration of queuing and scheduling

	  of packets, including ECN marking. Say Y, if you are planning to

	  use one of the NFP4000 and NFP6000 platforms which support this

	  functionality.

	  Code will be built into the nfp.ko driver.



config NFP_DEBUG

	bool "Debug support for Netronome(R) NFP4000/NFP6000 NIC drivers"

	depends on NFP

drivers/net/ethernet/netronome/nfp/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ nfp-objs := \ 
	    nfp_net_sriov.o \

	    nfp_netvf_main.o \

	    nfp_port.o \

	    nfp_shared_buf.o \

	    nic/main.o



ifeq ($(CONFIG_NFP_APP_FLOWER),y)
@@ -52,4 +53,10 @@ nfp-objs += \ 
	    bpf/jit.o

endif



ifeq ($(CONFIG_NFP_APP_ABM_NIC),y)

nfp-objs += \

	    abm/ctrl.o \

	    abm/main.o

endif



nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o

drivers/net/ethernet/netronome/nfp/abm/ctrl.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

/*

 * Copyright (C) 2018 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 <linux/kernel.h>



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

#include "../nfp_app.h"

#include "../nfp_main.h"

#include "../nfp_net.h"

#include "main.h"



void nfp_abm_ctrl_read_params(struct nfp_abm_link *alink)

{

	alink->queue_base = nn_readl(alink->vnic, NFP_NET_CFG_START_RXQ);

	alink->queue_base /= alink->vnic->stride_rx;

}



int nfp_abm_ctrl_find_addrs(struct nfp_abm *abm)

{

	struct nfp_pf *pf = abm->app->pf;

	unsigned int pf_id;



	pf_id =	nfp_cppcore_pcie_unit(pf->cpp);

	abm->pf_id = pf_id;



	return 0;

}

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

0 → 100644
+399 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

/*

 * Copyright (C) 2018 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 <linux/bitfield.h>

#include <linux/etherdevice.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/rcupdate.h>

#include <linux/slab.h>



#include "../nfpcore/nfp.h"

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

#include "../nfpcore/nfp_nsp.h"

#include "../nfp_app.h"

#include "../nfp_main.h"

#include "../nfp_net.h"

#include "../nfp_net_repr.h"

#include "../nfp_port.h"

#include "main.h"



static u32 nfp_abm_portid(enum nfp_repr_type rtype, unsigned int id)

{

	return FIELD_PREP(NFP_ABM_PORTID_TYPE, rtype) |

	       FIELD_PREP(NFP_ABM_PORTID_ID, id);

}



static struct net_device *nfp_abm_repr_get(struct nfp_app *app, u32 port_id)

{

	enum nfp_repr_type rtype;

	struct nfp_reprs *reprs;

	u8 port;



	rtype = FIELD_GET(NFP_ABM_PORTID_TYPE, port_id);

	port = FIELD_GET(NFP_ABM_PORTID_ID, port_id);



	reprs = rcu_dereference(app->reprs[rtype]);

	if (!reprs)

		return NULL;



	if (port >= reprs->num_reprs)

		return NULL;



	return rcu_dereference(reprs->reprs[port]);

}



static int

nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink,

		   enum nfp_port_type ptype)

{

	struct net_device *netdev;

	enum nfp_repr_type rtype;

	struct nfp_reprs *reprs;

	struct nfp_repr *repr;

	struct nfp_port *port;

	int err;



	if (ptype == NFP_PORT_PHYS_PORT)

		rtype = NFP_REPR_TYPE_PHYS_PORT;

	else

		rtype = NFP_REPR_TYPE_PF;



	netdev = nfp_repr_alloc(app);

	if (!netdev)

		return -ENOMEM;

	repr = netdev_priv(netdev);

	repr->app_priv = alink;



	port = nfp_port_alloc(app, ptype, netdev);

	if (IS_ERR(port)) {

		err = PTR_ERR(port);

		goto err_free_repr;

	}



	if (ptype == NFP_PORT_PHYS_PORT) {

		port->eth_forced = true;

		err = nfp_port_init_phy_port(app->pf, app, port, alink->id);

		if (err)

			goto err_free_port;

	} else {

		port->pf_id = alink->abm->pf_id;

		port->pf_split = app->pf->max_data_vnics > 1;

		port->pf_split_id = alink->id;

		port->vnic = alink->vnic->dp.ctrl_bar;

	}



	SET_NETDEV_DEV(netdev, &alink->vnic->pdev->dev);

	eth_hw_addr_random(netdev);



	err = nfp_repr_init(app, netdev, nfp_abm_portid(rtype, alink->id),

			    port, alink->vnic->dp.netdev);

	if (err)

		goto err_free_port;



	reprs = nfp_reprs_get_locked(app, rtype);

	WARN(nfp_repr_get_locked(app, reprs, alink->id), "duplicate repr");

	rcu_assign_pointer(reprs->reprs[alink->id], netdev);



	nfp_info(app->cpp, "%s Port %d Representor(%s) created\n",

		 ptype == NFP_PORT_PF_PORT ? "PCIe" : "Phys",

		 alink->id, netdev->name);



	return 0;



err_free_port:

	nfp_port_free(port);

err_free_repr:

	nfp_repr_free(netdev);

	return err;

}



static void

nfp_abm_kill_repr(struct nfp_app *app, struct nfp_abm_link *alink,

		  enum nfp_repr_type rtype)

{

	struct net_device *netdev;

	struct nfp_reprs *reprs;



	reprs = nfp_reprs_get_locked(app, rtype);

	netdev = nfp_repr_get_locked(app, reprs, alink->id);

	if (!netdev)

		return;

	rcu_assign_pointer(reprs->reprs[alink->id], NULL);

	synchronize_rcu();

	/* Cast to make sure nfp_repr_clean_and_free() takes a nfp_repr */

	nfp_repr_clean_and_free((struct nfp_repr *)netdev_priv(netdev));

}



static void

nfp_abm_kill_reprs(struct nfp_abm *abm, struct nfp_abm_link *alink)

{

	nfp_abm_kill_repr(abm->app, alink, NFP_REPR_TYPE_PF);

	nfp_abm_kill_repr(abm->app, alink, NFP_REPR_TYPE_PHYS_PORT);

}



static void nfp_abm_kill_reprs_all(struct nfp_abm *abm)

{

	struct nfp_pf *pf = abm->app->pf;

	struct nfp_net *nn;



	list_for_each_entry(nn, &pf->vnics, vnic_list)

		nfp_abm_kill_reprs(abm, (struct nfp_abm_link *)nn->app_priv);

}



static enum devlink_eswitch_mode nfp_abm_eswitch_mode_get(struct nfp_app *app)

{

	struct nfp_abm *abm = app->priv;



	return abm->eswitch_mode;

}



static int nfp_abm_eswitch_set_legacy(struct nfp_abm *abm)

{

	nfp_abm_kill_reprs_all(abm);



	abm->eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;

	return 0;

}



static void nfp_abm_eswitch_clean_up(struct nfp_abm *abm)

{

	if (abm->eswitch_mode != DEVLINK_ESWITCH_MODE_LEGACY)

		WARN_ON(nfp_abm_eswitch_set_legacy(abm));

}



static int nfp_abm_eswitch_set_switchdev(struct nfp_abm *abm)

{

	struct nfp_app *app = abm->app;

	struct nfp_pf *pf = app->pf;

	struct nfp_net *nn;

	int err;



	list_for_each_entry(nn, &pf->vnics, vnic_list) {

		struct nfp_abm_link *alink = nn->app_priv;



		err = nfp_abm_spawn_repr(app, alink, NFP_PORT_PHYS_PORT);

		if (err)

			goto err_kill_all_reprs;



		err = nfp_abm_spawn_repr(app, alink, NFP_PORT_PF_PORT);

		if (err)

			goto err_kill_all_reprs;

	}



	abm->eswitch_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;

	return 0;



err_kill_all_reprs:

	nfp_abm_kill_reprs_all(abm);

	return err;

}



static int nfp_abm_eswitch_mode_set(struct nfp_app *app, u16 mode)

{

	struct nfp_abm *abm = app->priv;



	if (abm->eswitch_mode == mode)

		return 0;



	switch (mode) {

	case DEVLINK_ESWITCH_MODE_LEGACY:

		return nfp_abm_eswitch_set_legacy(abm);

	case DEVLINK_ESWITCH_MODE_SWITCHDEV:

		return nfp_abm_eswitch_set_switchdev(abm);

	default:

		return -EINVAL;

	}

}



static void

nfp_abm_vnic_set_mac(struct nfp_pf *pf, struct nfp_abm *abm, struct nfp_net *nn,

		     unsigned int id)

{

	struct nfp_eth_table_port *eth_port = &pf->eth_tbl->ports[id];

	u8 mac_addr[ETH_ALEN];

	const char *mac_str;

	char name[32];



	if (id > pf->eth_tbl->count) {

		nfp_warn(pf->cpp, "No entry for persistent MAC address\n");

		eth_hw_addr_random(nn->dp.netdev);

		return;

	}



	snprintf(name, sizeof(name), "eth%u.mac.pf%u",

		 eth_port->eth_index, abm->pf_id);



	mac_str = nfp_hwinfo_lookup(pf->hwinfo, name);

	if (!mac_str) {

		nfp_warn(pf->cpp, "Can't lookup persistent MAC address (%s)\n",

			 name);

		eth_hw_addr_random(nn->dp.netdev);

		return;

	}



	if (sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",

		   &mac_addr[0], &mac_addr[1], &mac_addr[2],

		   &mac_addr[3], &mac_addr[4], &mac_addr[5]) != 6) {

		nfp_warn(pf->cpp, "Can't parse persistent MAC address (%s)\n",

			 mac_str);

		eth_hw_addr_random(nn->dp.netdev);

		return;

	}



	ether_addr_copy(nn->dp.netdev->dev_addr, mac_addr);

	ether_addr_copy(nn->dp.netdev->perm_addr, mac_addr);

}



static int

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

{

	struct nfp_eth_table_port *eth_port = &app->pf->eth_tbl->ports[id];

	struct nfp_abm *abm = app->priv;

	struct nfp_abm_link *alink;

	int err;



	alink = kzalloc(sizeof(*alink), GFP_KERNEL);

	if (!alink)

		return -ENOMEM;

	nn->app_priv = alink;

	alink->abm = abm;

	alink->vnic = nn;

	alink->id = id;



	/* This is a multi-host app, make sure MAC/PHY is up, but don't

	 * make the MAC/PHY state follow the state of any of the ports.

	 */

	err = nfp_eth_set_configured(app->cpp, eth_port->index, true);

	if (err < 0)

		goto err_free_alink;



	netif_keep_dst(nn->dp.netdev);



	nfp_abm_vnic_set_mac(app->pf, abm, nn, id);

	nfp_abm_ctrl_read_params(alink);



	return 0;



err_free_alink:

	kfree(alink);

	return err;

}



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

{

	struct nfp_abm_link *alink = nn->app_priv;



	nfp_abm_kill_reprs(alink->abm, alink);

	kfree(alink);

}



static int nfp_abm_init(struct nfp_app *app)

{

	struct nfp_pf *pf = app->pf;

	struct nfp_reprs *reprs;

	struct nfp_abm *abm;

	int err;



	if (!pf->eth_tbl) {

		nfp_err(pf->cpp, "ABM NIC requires ETH table\n");

		return -EINVAL;

	}

	if (pf->max_data_vnics != pf->eth_tbl->count) {

		nfp_err(pf->cpp, "ETH entries don't match vNICs (%d vs %d)\n",

			pf->max_data_vnics, pf->eth_tbl->count);

		return -EINVAL;

	}

	if (!pf->mac_stats_bar) {

		nfp_warn(app->cpp, "ABM NIC requires mac_stats symbol\n");

		return -EINVAL;

	}



	abm = kzalloc(sizeof(*abm), GFP_KERNEL);

	if (!abm)

		return -ENOMEM;

	app->priv = abm;

	abm->app = app;



	err = nfp_abm_ctrl_find_addrs(abm);

	if (err)

		goto err_free_abm;



	err = -ENOMEM;

	reprs = nfp_reprs_alloc(pf->max_data_vnics);

	if (!reprs)

		goto err_free_abm;

	RCU_INIT_POINTER(app->reprs[NFP_REPR_TYPE_PHYS_PORT], reprs);



	reprs = nfp_reprs_alloc(pf->max_data_vnics);

	if (!reprs)

		goto err_free_phys;

	RCU_INIT_POINTER(app->reprs[NFP_REPR_TYPE_PF], reprs);



	return 0;



err_free_phys:

	nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_PHYS_PORT);

err_free_abm:

	kfree(abm);

	app->priv = NULL;

	return err;

}



static void nfp_abm_clean(struct nfp_app *app)

{

	struct nfp_abm *abm = app->priv;



	nfp_abm_eswitch_clean_up(abm);

	nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_PF);

	nfp_reprs_clean_and_free_by_type(app, NFP_REPR_TYPE_PHYS_PORT);

	kfree(abm);

	app->priv = NULL;

}



const struct nfp_app_type app_abm = {

	.id		= NFP_APP_ACTIVE_BUFFER_MGMT_NIC,

	.name		= "abm",



	.init		= nfp_abm_init,

	.clean		= nfp_abm_clean,



	.vnic_alloc	= nfp_abm_vnic_alloc,

	.vnic_free	= nfp_abm_vnic_free,



	.eswitch_mode_get	= nfp_abm_eswitch_mode_get,

	.eswitch_mode_set	= nfp_abm_eswitch_mode_set,



	.repr_get	= nfp_abm_repr_get,

};

drivers/net/ethernet/netronome/nfp/abm/main.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */

/*

 * Copyright (C) 2018 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_ABM_H__

#define __NFP_ABM_H__ 1



#include <net/devlink.h>



struct nfp_app;

struct nfp_net;



#define NFP_ABM_PORTID_TYPE	GENMASK(23, 16)

#define NFP_ABM_PORTID_ID	GENMASK(7, 0)



/**

 * struct nfp_abm - ABM NIC app structure

 * @app:	back pointer to nfp_app

 * @pf_id:	ID of our PF link

 * @eswitch_mode:	devlink eswitch mode, advanced functions only visible

 *			in switchdev mode

 */

struct nfp_abm {

	struct nfp_app *app;

	unsigned int pf_id;

	enum devlink_eswitch_mode eswitch_mode;

};



/**

 * struct nfp_abm_link - port tuple of a ABM NIC

 * @abm:	back pointer to nfp_abm

 * @vnic:	data vNIC

 * @id:		id of the data vNIC

 * @queue_base:	id of base to host queue within PCIe (not QC idx)

 */

struct nfp_abm_link {

	struct nfp_abm *abm;

	struct nfp_net *vnic;

	unsigned int id;

	unsigned int queue_base;

};



void nfp_abm_ctrl_read_params(struct nfp_abm_link *alink);

int nfp_abm_ctrl_find_addrs(struct nfp_abm *abm);

#endif