nfp: abm: add initial active buffer management NIC skeleton
Add a very rudimentary active buffer management NIC support. For now it's like a core NIC without SR-IOV support. Next commits will extend its functionality. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b586c77b3c
commit
c4c8f39a57
|
@ -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
|
||||
|
|
|
@ -53,4 +53,9 @@ nfp-objs += \
|
|||
bpf/jit.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NFP_APP_ABM_NIC),y)
|
||||
nfp-objs += \
|
||||
abm/main.o
|
||||
endif
|
||||
|
||||
nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o
|
||||
|
|
|
@ -0,0 +1,85 @@
|
|||
// 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 "../nfpcore/nfp_cpp.h"
|
||||
#include "../nfpcore/nfp_nsp.h"
|
||||
#include "../nfp_app.h"
|
||||
#include "../nfp_main.h"
|
||||
#include "main.h"
|
||||
|
||||
static int nfp_abm_init(struct nfp_app *app)
|
||||
{
|
||||
struct nfp_pf *pf = app->pf;
|
||||
struct nfp_abm *abm;
|
||||
|
||||
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;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void nfp_abm_clean(struct nfp_app *app)
|
||||
{
|
||||
struct nfp_abm *abm = app->priv;
|
||||
|
||||
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_app_nic_vnic_alloc,
|
||||
};
|
|
@ -0,0 +1,47 @@
|
|||
/* 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
|
||||
|
||||
struct nfp_app;
|
||||
|
||||
/**
|
||||
* struct nfp_abm - ABM NIC app structure
|
||||
* @app: back pointer to nfp_app
|
||||
*/
|
||||
struct nfp_abm {
|
||||
struct nfp_app *app;
|
||||
};
|
||||
#endif
|
|
@ -54,6 +54,9 @@ static const struct nfp_app_type *apps[] = {
|
|||
#ifdef CONFIG_NFP_APP_FLOWER
|
||||
[NFP_APP_FLOWER_NIC] = &app_flower,
|
||||
#endif
|
||||
#ifdef CONFIG_NFP_APP_ABM_NIC
|
||||
[NFP_APP_ACTIVE_BUFFER_MGMT_NIC] = &app_abm,
|
||||
#endif
|
||||
};
|
||||
|
||||
struct nfp_app *nfp_app_from_netdev(struct net_device *netdev)
|
||||
|
|
|
@ -57,11 +57,13 @@ enum nfp_app_id {
|
|||
NFP_APP_CORE_NIC = 0x1,
|
||||
NFP_APP_BPF_NIC = 0x2,
|
||||
NFP_APP_FLOWER_NIC = 0x3,
|
||||
NFP_APP_ACTIVE_BUFFER_MGMT_NIC = 0x4,
|
||||
};
|
||||
|
||||
extern const struct nfp_app_type app_nic;
|
||||
extern const struct nfp_app_type app_bpf;
|
||||
extern const struct nfp_app_type app_flower;
|
||||
extern const struct nfp_app_type app_abm;
|
||||
|
||||
/**
|
||||
* struct nfp_app_type - application definition
|
||||
|
|
Loading…
Reference in New Issue