mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
Merge branch 'add-new-pcp-and-apptrust-attributes-to-dcbnl'
Daniel Machon says: ==================== Add new PCP and APPTRUST attributes to dcbnl This patch series adds new extension attributes to dcbnl, to support PCP prioritization (and thereby hw offloadable pcp-based queue classification) and per-selector trust and trust order. Additionally, the microchip sparx5 driver has been dcb-enabled to make use of the new attributes to offload PCP, DSCP and Default prio to the switch, and implement trust order of selectors. For pre-RFC discussion see: https://lore.kernel.org/netdev/Yv9VO1DYAxNduw6A@DEN-LT-70577/ For RFC series see: https://lore.kernel.org/netdev/20220915095757.2861822-1-daniel.machon@microchip.com/ In summary: there currently exist no convenient way to offload per-port PCP-based queue classification to hardware. The DCB subsystem offers different ways to prioritize through its APP table, but lacks an option for PCP. Similarly, there is no way to indicate the notion of trust for APP table selectors. This patch series addresses both topics. PCP based queue classification: - 8021Q standardizes the Priority Code Point table (see 6.9.3 of IEEE Std 802.1Q-2018). This patch series makes it possible, to offload the PCP classification to said table. The new PCP selector is not a standard part of the APP managed object, therefore it is encapsulated in a new non-std extension attribute. Selector trust: - ASIC's often has the notion of trust DSCP and trust PCP. The new attribute makes it possible to specify a trust order of app selectors, which drivers can then react on. DCB-enable sparx5 driver: - Now supports offloading of DSCP, PCP and default priority. Only one mapping of protocol:priority is allowed. Consecutive mappings of the same protocol to some new priority, will overwrite the previous. This is to keep a consistent view of the app table and the hardware. - Now supports dscp and pcp trust, by use of the introduced dcbnl_set/getapptrust ops. Sparx5 supports trust orders: [], [dscp], [pcp] and [dscp, pcp]. For now, only DSCP and PCP selectors are supported by the driver, everything else is bounced. Patch #1 introduces a new PCP selector to the APP object, which makes it possible to encode PCP and DEI in the app triplet and offload it to the PCP table of the ASIC. Patch #2 Introduces the new extension attributes DCB_ATTR_DCB_APP_TRUST_TABLE and DCB_ATTR_DCB_APP_TRUST. Trusted selectors are passed in the nested DCB_ATTR_DCB_APP_TRUST_TABLE attribute, and assembled into an array of selectors: u8 selectors[256]; where lower indexes has higher precedence. In the array, selectors are stored consecutively, starting from index zero. With a maximum number of 256 unique selectors, the list has the same maximum size. Patch #3 Sets up the dcbnl ops hook, and adds support for offloading pcp app entries, to the PCP table of the switch. Patch #4 Makes use of the dcbnl_set/getapptrust ops, to set a per-port trust order. Patch #5 Adds support for offloading dscp app entries to the DSCP table of the switch. Patch #6 Adds support for offloading default prio app entries to the switch. ==================== Link: https://lore.kernel.org/r/20221101094834.2726202-1-daniel.machon@microchip.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni
commit
d9095f9295
@ -12,3 +12,14 @@ config SPARX5_SWITCH
|
||||
select VCAP
|
||||
help
|
||||
This driver supports the Sparx5 network switch device.
|
||||
|
||||
config SPARX5_DCB
|
||||
bool "Data Center Bridging (DCB) support"
|
||||
depends on SPARX5_SWITCH && DCB
|
||||
default y
|
||||
help
|
||||
Say Y here if you want to use Data Center Bridging (DCB) in the
|
||||
driver. This can be used to assign priority to traffic, based on
|
||||
DSCP and PCP.
|
||||
|
||||
If unsure, set to Y.
|
||||
|
||||
@ -11,5 +11,7 @@ sparx5-switch-y := sparx5_main.o sparx5_packet.o \
|
||||
sparx5_ptp.o sparx5_pgid.o sparx5_tc.o sparx5_qos.o \
|
||||
sparx5_vcap_impl.o sparx5_vcap_ag_api.o sparx5_tc_flower.o
|
||||
|
||||
sparx5-switch-$(CONFIG_SPARX5_DCB) += sparx5_dcb.o
|
||||
|
||||
# Provide include files
|
||||
ccflags-y += -I$(srctree)/drivers/net/ethernet/microchip/vcap
|
||||
|
||||
310
drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c
Normal file
310
drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c
Normal file
@ -0,0 +1,310 @@
|
||||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/* Microchip Sparx5 Switch driver
|
||||
*
|
||||
* Copyright (c) 2022 Microchip Technology Inc. and its subsidiaries.
|
||||
*/
|
||||
|
||||
#include <net/dcbnl.h>
|
||||
|
||||
#include "sparx5_port.h"
|
||||
|
||||
enum sparx5_dcb_apptrust_values {
|
||||
SPARX5_DCB_APPTRUST_EMPTY,
|
||||
SPARX5_DCB_APPTRUST_DSCP,
|
||||
SPARX5_DCB_APPTRUST_PCP,
|
||||
SPARX5_DCB_APPTRUST_DSCP_PCP,
|
||||
__SPARX5_DCB_APPTRUST_MAX
|
||||
};
|
||||
|
||||
static const struct sparx5_dcb_apptrust {
|
||||
u8 selectors[IEEE_8021QAZ_APP_SEL_MAX + 1];
|
||||
int nselectors;
|
||||
} *sparx5_port_apptrust[SPX5_PORTS];
|
||||
|
||||
static const char *sparx5_dcb_apptrust_names[__SPARX5_DCB_APPTRUST_MAX] = {
|
||||
[SPARX5_DCB_APPTRUST_EMPTY] = "empty",
|
||||
[SPARX5_DCB_APPTRUST_DSCP] = "dscp",
|
||||
[SPARX5_DCB_APPTRUST_PCP] = "pcp",
|
||||
[SPARX5_DCB_APPTRUST_DSCP_PCP] = "dscp pcp"
|
||||
};
|
||||
|
||||
/* Sparx5 supported apptrust policies */
|
||||
static const struct sparx5_dcb_apptrust
|
||||
sparx5_dcb_apptrust_policies[__SPARX5_DCB_APPTRUST_MAX] = {
|
||||
/* Empty *must* be first */
|
||||
[SPARX5_DCB_APPTRUST_EMPTY] = { { 0 }, 0 },
|
||||
[SPARX5_DCB_APPTRUST_DSCP] = { { IEEE_8021QAZ_APP_SEL_DSCP }, 1 },
|
||||
[SPARX5_DCB_APPTRUST_PCP] = { { DCB_APP_SEL_PCP }, 1 },
|
||||
[SPARX5_DCB_APPTRUST_DSCP_PCP] = { { IEEE_8021QAZ_APP_SEL_DSCP,
|
||||
DCB_APP_SEL_PCP }, 2 },
|
||||
};
|
||||
|
||||
/* Validate app entry.
|
||||
*
|
||||
* Check for valid selectors and valid protocol and priority ranges.
|
||||
*/
|
||||
static int sparx5_dcb_app_validate(struct net_device *dev,
|
||||
const struct dcb_app *app)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
switch (app->selector) {
|
||||
/* Default priority checks */
|
||||
case IEEE_8021QAZ_APP_SEL_ETHERTYPE:
|
||||
if (app->protocol != 0)
|
||||
err = -EINVAL;
|
||||
else if (app->priority >= SPX5_PRIOS)
|
||||
err = -ERANGE;
|
||||
break;
|
||||
/* Dscp checks */
|
||||
case IEEE_8021QAZ_APP_SEL_DSCP:
|
||||
if (app->protocol >= SPARX5_PORT_QOS_DSCP_COUNT)
|
||||
err = -EINVAL;
|
||||
else if (app->priority >= SPX5_PRIOS)
|
||||
err = -ERANGE;
|
||||
break;
|
||||
/* Pcp checks */
|
||||
case DCB_APP_SEL_PCP:
|
||||
if (app->protocol >= SPARX5_PORT_QOS_PCP_DEI_COUNT)
|
||||
err = -EINVAL;
|
||||
else if (app->priority >= SPX5_PRIOS)
|
||||
err = -ERANGE;
|
||||
break;
|
||||
default:
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
if (err)
|
||||
netdev_err(dev, "Invalid entry: %d:%d\n", app->protocol,
|
||||
app->priority);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Validate apptrust configuration.
|
||||
*
|
||||
* Return index of supported apptrust configuration if valid, otherwise return
|
||||
* error.
|
||||
*/
|
||||
static int sparx5_dcb_apptrust_validate(struct net_device *dev, u8 *selectors,
|
||||
int nselectors, int *err)
|
||||
{
|
||||
bool match;
|
||||
int i, ii;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(sparx5_dcb_apptrust_policies); i++) {
|
||||
if (sparx5_dcb_apptrust_policies[i].nselectors != nselectors)
|
||||
continue;
|
||||
match = true;
|
||||
for (ii = 0; ii < nselectors; ii++) {
|
||||
if (sparx5_dcb_apptrust_policies[i].selectors[ii] !=
|
||||
*(selectors + ii)) {
|
||||
match = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (match)
|
||||
break;
|
||||
}
|
||||
|
||||
/* Requested trust configuration is not supported */
|
||||
if (!match) {
|
||||
netdev_err(dev, "Valid apptrust configurations are:\n");
|
||||
for (i = 0; i < ARRAY_SIZE(sparx5_dcb_apptrust_names); i++)
|
||||
pr_info("order: %s\n", sparx5_dcb_apptrust_names[i]);
|
||||
*err = -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
static bool sparx5_dcb_apptrust_contains(int portno, u8 selector)
|
||||
{
|
||||
const struct sparx5_dcb_apptrust *conf = sparx5_port_apptrust[portno];
|
||||
int i;
|
||||
|
||||
for (i = 0; i < conf->nselectors; i++)
|
||||
if (conf->selectors[i] == selector)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static int sparx5_dcb_app_update(struct net_device *dev)
|
||||
{
|
||||
struct sparx5_port *port = netdev_priv(dev);
|
||||
struct sparx5_port_qos_dscp_map *dscp_map;
|
||||
struct sparx5_port_qos_pcp_map *pcp_map;
|
||||
struct sparx5_port_qos qos = {0};
|
||||
struct dcb_app app_itr = {0};
|
||||
int portno = port->portno;
|
||||
int i;
|
||||
|
||||
dscp_map = &qos.dscp.map;
|
||||
pcp_map = &qos.pcp.map;
|
||||
|
||||
/* Get default prio. */
|
||||
qos.default_prio = dcb_ieee_getapp_default_prio_mask(dev);
|
||||
if (qos.default_prio)
|
||||
qos.default_prio = fls(qos.default_prio) - 1;
|
||||
|
||||
/* Get dscp ingress mapping */
|
||||
for (i = 0; i < ARRAY_SIZE(dscp_map->map); i++) {
|
||||
app_itr.selector = IEEE_8021QAZ_APP_SEL_DSCP;
|
||||
app_itr.protocol = i;
|
||||
dscp_map->map[i] = dcb_getapp(dev, &app_itr);
|
||||
}
|
||||
|
||||
/* Get pcp ingress mapping */
|
||||
for (i = 0; i < ARRAY_SIZE(pcp_map->map); i++) {
|
||||
app_itr.selector = DCB_APP_SEL_PCP;
|
||||
app_itr.protocol = i;
|
||||
pcp_map->map[i] = dcb_getapp(dev, &app_itr);
|
||||
}
|
||||
|
||||
/* Enable use of pcp for queue classification ? */
|
||||
if (sparx5_dcb_apptrust_contains(portno, DCB_APP_SEL_PCP)) {
|
||||
qos.pcp.qos_enable = true;
|
||||
qos.pcp.dp_enable = qos.pcp.qos_enable;
|
||||
}
|
||||
|
||||
/* Enable use of dscp for queue classification ? */
|
||||
if (sparx5_dcb_apptrust_contains(portno, IEEE_8021QAZ_APP_SEL_DSCP)) {
|
||||
qos.dscp.qos_enable = true;
|
||||
qos.dscp.dp_enable = qos.dscp.qos_enable;
|
||||
}
|
||||
|
||||
return sparx5_port_qos_set(port, &qos);
|
||||
}
|
||||
|
||||
/* Set or delete dscp app entry.
|
||||
*
|
||||
* Dscp mapping is global for all ports, so set and delete app entries are
|
||||
* replicated for each port.
|
||||
*/
|
||||
static int sparx5_dcb_ieee_dscp_setdel_app(struct net_device *dev,
|
||||
struct dcb_app *app, bool del)
|
||||
{
|
||||
struct sparx5_port *port = netdev_priv(dev);
|
||||
struct dcb_app apps[SPX5_PORTS];
|
||||
struct sparx5_port *port_itr;
|
||||
int err, i;
|
||||
|
||||
for (i = 0; i < SPX5_PORTS; i++) {
|
||||
port_itr = port->sparx5->ports[i];
|
||||
if (!port_itr)
|
||||
continue;
|
||||
memcpy(&apps[i], app, sizeof(struct dcb_app));
|
||||
if (del)
|
||||
err = dcb_ieee_delapp(port_itr->ndev, &apps[i]);
|
||||
else
|
||||
err = dcb_ieee_setapp(port_itr->ndev, &apps[i]);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app)
|
||||
{
|
||||
struct dcb_app app_itr;
|
||||
int err = 0;
|
||||
u8 prio;
|
||||
|
||||
err = sparx5_dcb_app_validate(dev, app);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
/* Delete current mapping, if it exists */
|
||||
prio = dcb_getapp(dev, app);
|
||||
if (prio) {
|
||||
app_itr = *app;
|
||||
app_itr.priority = prio;
|
||||
dcb_ieee_delapp(dev, &app_itr);
|
||||
}
|
||||
|
||||
if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP)
|
||||
err = sparx5_dcb_ieee_dscp_setdel_app(dev, app, false);
|
||||
else
|
||||
err = dcb_ieee_setapp(dev, app);
|
||||
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
sparx5_dcb_app_update(dev);
|
||||
|
||||
out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int sparx5_dcb_ieee_delapp(struct net_device *dev, struct dcb_app *app)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP)
|
||||
err = sparx5_dcb_ieee_dscp_setdel_app(dev, app, true);
|
||||
else
|
||||
err = dcb_ieee_delapp(dev, app);
|
||||
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return sparx5_dcb_app_update(dev);
|
||||
}
|
||||
|
||||
static int sparx5_dcb_setapptrust(struct net_device *dev, u8 *selectors,
|
||||
int nselectors)
|
||||
{
|
||||
struct sparx5_port *port = netdev_priv(dev);
|
||||
int err = 0, idx;
|
||||
|
||||
idx = sparx5_dcb_apptrust_validate(dev, selectors, nselectors, &err);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
sparx5_port_apptrust[port->portno] = &sparx5_dcb_apptrust_policies[idx];
|
||||
|
||||
return sparx5_dcb_app_update(dev);
|
||||
}
|
||||
|
||||
static int sparx5_dcb_getapptrust(struct net_device *dev, u8 *selectors,
|
||||
int *nselectors)
|
||||
{
|
||||
struct sparx5_port *port = netdev_priv(dev);
|
||||
const struct sparx5_dcb_apptrust *trust;
|
||||
|
||||
trust = sparx5_port_apptrust[port->portno];
|
||||
|
||||
memcpy(selectors, trust->selectors, trust->nselectors);
|
||||
*nselectors = trust->nselectors;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const struct dcbnl_rtnl_ops sparx5_dcbnl_ops = {
|
||||
.ieee_setapp = sparx5_dcb_ieee_setapp,
|
||||
.ieee_delapp = sparx5_dcb_ieee_delapp,
|
||||
.dcbnl_setapptrust = sparx5_dcb_setapptrust,
|
||||
.dcbnl_getapptrust = sparx5_dcb_getapptrust,
|
||||
};
|
||||
|
||||
int sparx5_dcb_init(struct sparx5 *sparx5)
|
||||
{
|
||||
struct sparx5_port *port;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < SPX5_PORTS; i++) {
|
||||
port = sparx5->ports[i];
|
||||
if (!port)
|
||||
continue;
|
||||
port->ndev->dcbnl_ops = &sparx5_dcbnl_ops;
|
||||
/* Initialize [dscp, pcp] default trust */
|
||||
sparx5_port_apptrust[port->portno] =
|
||||
&sparx5_dcb_apptrust_policies
|
||||
[SPARX5_DCB_APPTRUST_DSCP_PCP];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -359,6 +359,16 @@ int sparx5_config_dsm_calendar(struct sparx5 *sparx5);
|
||||
void sparx5_get_stats64(struct net_device *ndev, struct rtnl_link_stats64 *stats);
|
||||
int sparx_stats_init(struct sparx5 *sparx5);
|
||||
|
||||
/* sparx5_dcb.c */
|
||||
#ifdef CONFIG_SPARX5_DCB
|
||||
int sparx5_dcb_init(struct sparx5 *sparx5);
|
||||
#else
|
||||
static inline int sparx5_dcb_init(struct sparx5 *sparx5)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* sparx5_netdev.c */
|
||||
void sparx5_set_port_ifh_timestamp(void *ifh_hdr, u64 timestamp);
|
||||
void sparx5_set_port_ifh_rew_op(void *ifh_hdr, u32 rew_op);
|
||||
@ -424,6 +434,7 @@ static inline bool sparx5_is_baser(phy_interface_t interface)
|
||||
extern const struct phylink_mac_ops sparx5_phylink_mac_ops;
|
||||
extern const struct phylink_pcs_ops sparx5_phylink_pcs_ops;
|
||||
extern const struct ethtool_ops sparx5_ethtool_ops;
|
||||
extern const struct dcbnl_rtnl_ops sparx5_dcbnl_ops;
|
||||
|
||||
/* Calculate raw offset */
|
||||
static inline __pure int spx5_offset(int id, int tinst, int tcnt,
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* Copyright (c) 2021 Microchip Technology Inc.
|
||||
*/
|
||||
|
||||
/* This file is autogenerated by cml-utils 2022-09-12 14:22:42 +0200.
|
||||
* Commit ID: 06aecbca4eab6e85d87f665fe6b6348c48146245
|
||||
/* This file is autogenerated by cml-utils 2022-09-28 11:17:02 +0200.
|
||||
* Commit ID: 385c8a11d71a9f6a60368d3a3cb648fa257b479a
|
||||
*/
|
||||
|
||||
#ifndef _SPARX5_MAIN_REGS_H_
|
||||
@ -750,6 +750,96 @@ enum sparx5_target {
|
||||
#define ANA_CL_VLAN_CTRL_2_VLAN_PUSH_CNT_GET(x)\
|
||||
FIELD_GET(ANA_CL_VLAN_CTRL_2_VLAN_PUSH_CNT, x)
|
||||
|
||||
/* ANA_CL:PORT:PCP_DEI_MAP_CFG */
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG(g, r) __REG(TARGET_ANA_CL, 0, 1, 131072, g, 70, 512, 108, r, 16, 4)
|
||||
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL GENMASK(4, 3)
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL, x)
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL, x)
|
||||
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL GENMASK(2, 0)
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL, x)
|
||||
#define ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL, x)
|
||||
|
||||
/* ANA_CL:PORT:QOS_CFG */
|
||||
#define ANA_CL_QOS_CFG(g) __REG(TARGET_ANA_CL, 0, 1, 131072, g, 70, 512, 172, 0, 1, 4)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_ENA BIT(17)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DEFAULT_COSID_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DEFAULT_COSID_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_VAL GENMASK(16, 14)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DEFAULT_COSID_VAL, x)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_COSID_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DEFAULT_COSID_VAL, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DSCP_REWR_MODE_SEL GENMASK(13, 12)
|
||||
#define ANA_CL_QOS_CFG_DSCP_REWR_MODE_SEL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DSCP_REWR_MODE_SEL, x)
|
||||
#define ANA_CL_QOS_CFG_DSCP_REWR_MODE_SEL_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DSCP_REWR_MODE_SEL, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DSCP_TRANSLATE_ENA BIT(11)
|
||||
#define ANA_CL_QOS_CFG_DSCP_TRANSLATE_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DSCP_TRANSLATE_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_DSCP_TRANSLATE_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DSCP_TRANSLATE_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DSCP_KEEP_ENA BIT(10)
|
||||
#define ANA_CL_QOS_CFG_DSCP_KEEP_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DSCP_KEEP_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_DSCP_KEEP_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DSCP_KEEP_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_KEEP_ENA BIT(9)
|
||||
#define ANA_CL_QOS_CFG_KEEP_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_KEEP_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_KEEP_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_KEEP_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_DP_ENA BIT(8)
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_DP_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_PCP_DEI_DP_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_DP_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_PCP_DEI_DP_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA BIT(7)
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DSCP_DP_ENA BIT(6)
|
||||
#define ANA_CL_QOS_CFG_DSCP_DP_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DSCP_DP_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_DSCP_DP_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DSCP_DP_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DSCP_QOS_ENA BIT(5)
|
||||
#define ANA_CL_QOS_CFG_DSCP_QOS_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DSCP_QOS_ENA, x)
|
||||
#define ANA_CL_QOS_CFG_DSCP_QOS_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DSCP_QOS_ENA, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_DP_VAL GENMASK(4, 3)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_DP_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DEFAULT_DP_VAL, x)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_DP_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DEFAULT_DP_VAL, x)
|
||||
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_QOS_VAL GENMASK(2, 0)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_QOS_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_QOS_CFG_DEFAULT_QOS_VAL, x)
|
||||
#define ANA_CL_QOS_CFG_DEFAULT_QOS_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_QOS_CFG_DEFAULT_QOS_VAL, x)
|
||||
|
||||
/* ANA_CL:PORT:CAPTURE_BPDU_CFG */
|
||||
#define ANA_CL_CAPTURE_BPDU_CFG(g) __REG(TARGET_ANA_CL, 0, 1, 131072, g, 70, 512, 196, 0, 1, 4)
|
||||
|
||||
@ -762,6 +852,39 @@ enum sparx5_target {
|
||||
#define ANA_CL_OWN_UPSID_OWN_UPSID_GET(x)\
|
||||
FIELD_GET(ANA_CL_OWN_UPSID_OWN_UPSID, x)
|
||||
|
||||
/* ANA_CL:COMMON:DSCP_CFG */
|
||||
#define ANA_CL_DSCP_CFG(r) __REG(TARGET_ANA_CL, 0, 1, 166912, 0, 1, 756, 256, r, 64, 4)
|
||||
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRANSLATE_VAL GENMASK(12, 7)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRANSLATE_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_DSCP_CFG_DSCP_TRANSLATE_VAL, x)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRANSLATE_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_DSCP_CFG_DSCP_TRANSLATE_VAL, x)
|
||||
|
||||
#define ANA_CL_DSCP_CFG_DSCP_QOS_VAL GENMASK(6, 4)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_QOS_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_DSCP_CFG_DSCP_QOS_VAL, x)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_QOS_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_DSCP_CFG_DSCP_QOS_VAL, x)
|
||||
|
||||
#define ANA_CL_DSCP_CFG_DSCP_DP_VAL GENMASK(3, 2)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_DP_VAL_SET(x)\
|
||||
FIELD_PREP(ANA_CL_DSCP_CFG_DSCP_DP_VAL, x)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_DP_VAL_GET(x)\
|
||||
FIELD_GET(ANA_CL_DSCP_CFG_DSCP_DP_VAL, x)
|
||||
|
||||
#define ANA_CL_DSCP_CFG_DSCP_REWR_ENA BIT(1)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_REWR_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_DSCP_CFG_DSCP_REWR_ENA, x)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_REWR_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_DSCP_CFG_DSCP_REWR_ENA, x)
|
||||
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRUST_ENA BIT(0)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRUST_ENA_SET(x)\
|
||||
FIELD_PREP(ANA_CL_DSCP_CFG_DSCP_TRUST_ENA, x)
|
||||
#define ANA_CL_DSCP_CFG_DSCP_TRUST_ENA_GET(x)\
|
||||
FIELD_GET(ANA_CL_DSCP_CFG_DSCP_TRUST_ENA, x)
|
||||
|
||||
/* ANA_L2:COMMON:AUTO_LRN_CFG */
|
||||
#define ANA_L2_AUTO_LRN_CFG __REG(TARGET_ANA_L2, 0, 1, 566024, 0, 1, 700, 24, 0, 1, 4)
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/phy/phy.h>
|
||||
#include <net/dcbnl.h>
|
||||
|
||||
#include "sparx5_main_regs.h"
|
||||
#include "sparx5_main.h"
|
||||
@ -1144,3 +1145,101 @@ void sparx5_port_enable(struct sparx5_port *port, bool enable)
|
||||
sparx5,
|
||||
QFWD_SWITCH_PORT_MODE(port->portno));
|
||||
}
|
||||
|
||||
int sparx5_port_qos_set(struct sparx5_port *port,
|
||||
struct sparx5_port_qos *qos)
|
||||
{
|
||||
sparx5_port_qos_dscp_set(port, &qos->dscp);
|
||||
sparx5_port_qos_pcp_set(port, &qos->pcp);
|
||||
sparx5_port_qos_default_set(port, qos);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sparx5_port_qos_pcp_set(const struct sparx5_port *port,
|
||||
struct sparx5_port_qos_pcp *qos)
|
||||
{
|
||||
struct sparx5 *sparx5 = port->sparx5;
|
||||
u8 *pcp_itr = qos->map.map;
|
||||
u8 pcp, dp;
|
||||
int i;
|
||||
|
||||
/* Enable/disable pcp and dp for qos classification. */
|
||||
spx5_rmw(ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA_SET(qos->qos_enable) |
|
||||
ANA_CL_QOS_CFG_PCP_DEI_DP_ENA_SET(qos->dp_enable),
|
||||
ANA_CL_QOS_CFG_PCP_DEI_QOS_ENA | ANA_CL_QOS_CFG_PCP_DEI_DP_ENA,
|
||||
sparx5, ANA_CL_QOS_CFG(port->portno));
|
||||
|
||||
/* Map each pcp and dei value to priority and dp */
|
||||
for (i = 0; i < ARRAY_SIZE(qos->map.map); i++) {
|
||||
pcp = *(pcp_itr + i);
|
||||
dp = (i < SPARX5_PORT_QOS_PCP_COUNT) ? 0 : 1;
|
||||
spx5_rmw(ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL_SET(pcp) |
|
||||
ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL_SET(dp),
|
||||
ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_QOS_VAL |
|
||||
ANA_CL_PCP_DEI_MAP_CFG_PCP_DEI_DP_VAL, sparx5,
|
||||
ANA_CL_PCP_DEI_MAP_CFG(port->portno, i));
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sparx5_port_qos_dscp_set(const struct sparx5_port *port,
|
||||
struct sparx5_port_qos_dscp *qos)
|
||||
{
|
||||
struct sparx5 *sparx5 = port->sparx5;
|
||||
u8 *dscp = qos->map.map;
|
||||
int i;
|
||||
|
||||
/* Enable/disable dscp and dp for qos classification.
|
||||
* Disable rewrite of dscp values for now.
|
||||
*/
|
||||
spx5_rmw(ANA_CL_QOS_CFG_DSCP_QOS_ENA_SET(qos->qos_enable) |
|
||||
ANA_CL_QOS_CFG_DSCP_DP_ENA_SET(qos->dp_enable) |
|
||||
ANA_CL_QOS_CFG_DSCP_KEEP_ENA_SET(1),
|
||||
ANA_CL_QOS_CFG_DSCP_QOS_ENA | ANA_CL_QOS_CFG_DSCP_DP_ENA |
|
||||
ANA_CL_QOS_CFG_DSCP_KEEP_ENA, sparx5,
|
||||
ANA_CL_QOS_CFG(port->portno));
|
||||
|
||||
/* Map each dscp value to priority and dp */
|
||||
for (i = 0; i < ARRAY_SIZE(qos->map.map); i++) {
|
||||
spx5_rmw(ANA_CL_DSCP_CFG_DSCP_QOS_VAL_SET(*(dscp + i)) |
|
||||
ANA_CL_DSCP_CFG_DSCP_DP_VAL_SET(0),
|
||||
ANA_CL_DSCP_CFG_DSCP_QOS_VAL |
|
||||
ANA_CL_DSCP_CFG_DSCP_DP_VAL, sparx5,
|
||||
ANA_CL_DSCP_CFG(i));
|
||||
}
|
||||
|
||||
/* Set per-dscp trust */
|
||||
for (i = 0; i < ARRAY_SIZE(qos->map.map); i++) {
|
||||
if (qos->qos_enable) {
|
||||
spx5_rmw(ANA_CL_DSCP_CFG_DSCP_TRUST_ENA_SET(1),
|
||||
ANA_CL_DSCP_CFG_DSCP_TRUST_ENA, sparx5,
|
||||
ANA_CL_DSCP_CFG(i));
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sparx5_port_qos_default_set(const struct sparx5_port *port,
|
||||
const struct sparx5_port_qos *qos)
|
||||
{
|
||||
struct sparx5 *sparx5 = port->sparx5;
|
||||
|
||||
/* Set default prio and dp level */
|
||||
spx5_rmw(ANA_CL_QOS_CFG_DEFAULT_QOS_VAL_SET(qos->default_prio) |
|
||||
ANA_CL_QOS_CFG_DEFAULT_DP_VAL_SET(0),
|
||||
ANA_CL_QOS_CFG_DEFAULT_QOS_VAL |
|
||||
ANA_CL_QOS_CFG_DEFAULT_DP_VAL,
|
||||
sparx5, ANA_CL_QOS_CFG(port->portno));
|
||||
|
||||
/* Set default pcp and dei for untagged frames */
|
||||
spx5_rmw(ANA_CL_VLAN_CTRL_PORT_PCP_SET(0) |
|
||||
ANA_CL_VLAN_CTRL_PORT_DEI_SET(0),
|
||||
ANA_CL_VLAN_CTRL_PORT_PCP |
|
||||
ANA_CL_VLAN_CTRL_PORT_DEI,
|
||||
sparx5, ANA_CL_VLAN_CTRL(port->portno));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -91,4 +91,46 @@ int sparx5_get_port_status(struct sparx5 *sparx5,
|
||||
void sparx5_port_enable(struct sparx5_port *port, bool enable);
|
||||
int sparx5_port_fwd_urg(struct sparx5 *sparx5, u32 speed);
|
||||
|
||||
#define SPARX5_PORT_QOS_PCP_COUNT 8
|
||||
#define SPARX5_PORT_QOS_DEI_COUNT 8
|
||||
#define SPARX5_PORT_QOS_PCP_DEI_COUNT \
|
||||
(SPARX5_PORT_QOS_PCP_COUNT + SPARX5_PORT_QOS_DEI_COUNT)
|
||||
struct sparx5_port_qos_pcp_map {
|
||||
u8 map[SPARX5_PORT_QOS_PCP_DEI_COUNT];
|
||||
};
|
||||
|
||||
#define SPARX5_PORT_QOS_DSCP_COUNT 64
|
||||
struct sparx5_port_qos_dscp_map {
|
||||
u8 map[SPARX5_PORT_QOS_DSCP_COUNT];
|
||||
};
|
||||
|
||||
struct sparx5_port_qos_pcp {
|
||||
struct sparx5_port_qos_pcp_map map;
|
||||
bool qos_enable;
|
||||
bool dp_enable;
|
||||
};
|
||||
|
||||
struct sparx5_port_qos_dscp {
|
||||
struct sparx5_port_qos_dscp_map map;
|
||||
bool qos_enable;
|
||||
bool dp_enable;
|
||||
};
|
||||
|
||||
struct sparx5_port_qos {
|
||||
struct sparx5_port_qos_pcp pcp;
|
||||
struct sparx5_port_qos_dscp dscp;
|
||||
u8 default_prio;
|
||||
};
|
||||
|
||||
int sparx5_port_qos_set(struct sparx5_port *port, struct sparx5_port_qos *qos);
|
||||
|
||||
int sparx5_port_qos_pcp_set(const struct sparx5_port *port,
|
||||
struct sparx5_port_qos_pcp *qos);
|
||||
|
||||
int sparx5_port_qos_dscp_set(const struct sparx5_port *port,
|
||||
struct sparx5_port_qos_dscp *qos);
|
||||
|
||||
int sparx5_port_qos_default_set(const struct sparx5_port *port,
|
||||
const struct sparx5_port_qos *qos);
|
||||
|
||||
#endif /* __SPARX5_PORT_H__ */
|
||||
|
||||
@ -389,6 +389,10 @@ int sparx5_qos_init(struct sparx5 *sparx5)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = sparx5_dcb_init(sparx5);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -109,6 +109,10 @@ struct dcbnl_rtnl_ops {
|
||||
/* buffer settings */
|
||||
int (*dcbnl_getbuffer)(struct net_device *, struct dcbnl_buffer *);
|
||||
int (*dcbnl_setbuffer)(struct net_device *, struct dcbnl_buffer *);
|
||||
|
||||
/* apptrust */
|
||||
int (*dcbnl_setapptrust)(struct net_device *, u8 *, int);
|
||||
int (*dcbnl_getapptrust)(struct net_device *, u8 *, int *);
|
||||
};
|
||||
|
||||
#endif /* __NET_DCBNL_H__ */
|
||||
|
||||
@ -218,6 +218,9 @@ struct cee_pfc {
|
||||
#define IEEE_8021QAZ_APP_SEL_ANY 4
|
||||
#define IEEE_8021QAZ_APP_SEL_DSCP 5
|
||||
|
||||
/* Non-std selector values */
|
||||
#define DCB_APP_SEL_PCP 255
|
||||
|
||||
/* This structure contains the IEEE 802.1Qaz APP managed object. This
|
||||
* object is also used for the CEE std as well.
|
||||
*
|
||||
@ -247,6 +250,8 @@ struct dcb_app {
|
||||
__u16 protocol;
|
||||
};
|
||||
|
||||
#define IEEE_8021QAZ_APP_SEL_MAX 255
|
||||
|
||||
/**
|
||||
* struct dcb_peer_app_info - APP feature information sent by the peer
|
||||
*
|
||||
@ -405,6 +410,7 @@ enum dcbnl_attrs {
|
||||
* @DCB_ATTR_IEEE_PEER_ETS: peer ETS configuration - get only
|
||||
* @DCB_ATTR_IEEE_PEER_PFC: peer PFC configuration - get only
|
||||
* @DCB_ATTR_IEEE_PEER_APP: peer APP tlv - get only
|
||||
* @DCB_ATTR_DCB_APP_TRUST_TABLE: selector trust table
|
||||
*/
|
||||
enum ieee_attrs {
|
||||
DCB_ATTR_IEEE_UNSPEC,
|
||||
@ -418,6 +424,7 @@ enum ieee_attrs {
|
||||
DCB_ATTR_IEEE_QCN,
|
||||
DCB_ATTR_IEEE_QCN_STATS,
|
||||
DCB_ATTR_DCB_BUFFER,
|
||||
DCB_ATTR_DCB_APP_TRUST_TABLE,
|
||||
__DCB_ATTR_IEEE_MAX
|
||||
};
|
||||
#define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
|
||||
@ -425,6 +432,7 @@ enum ieee_attrs {
|
||||
enum ieee_attrs_app {
|
||||
DCB_ATTR_IEEE_APP_UNSPEC,
|
||||
DCB_ATTR_IEEE_APP,
|
||||
DCB_ATTR_DCB_APP,
|
||||
__DCB_ATTR_IEEE_APP_MAX
|
||||
};
|
||||
#define DCB_ATTR_IEEE_APP_MAX (__DCB_ATTR_IEEE_APP_MAX - 1)
|
||||
|
||||
134
net/dcb/dcbnl.c
134
net/dcb/dcbnl.c
@ -166,6 +166,7 @@ static const struct nla_policy dcbnl_ieee_policy[DCB_ATTR_IEEE_MAX + 1] = {
|
||||
[DCB_ATTR_IEEE_QCN] = {.len = sizeof(struct ieee_qcn)},
|
||||
[DCB_ATTR_IEEE_QCN_STATS] = {.len = sizeof(struct ieee_qcn_stats)},
|
||||
[DCB_ATTR_DCB_BUFFER] = {.len = sizeof(struct dcbnl_buffer)},
|
||||
[DCB_ATTR_DCB_APP_TRUST_TABLE] = {.type = NLA_NESTED},
|
||||
};
|
||||
|
||||
/* DCB number of traffic classes nested attributes. */
|
||||
@ -179,6 +180,38 @@ static const struct nla_policy dcbnl_featcfg_nest[DCB_FEATCFG_ATTR_MAX + 1] = {
|
||||
static LIST_HEAD(dcb_app_list);
|
||||
static DEFINE_SPINLOCK(dcb_lock);
|
||||
|
||||
static enum ieee_attrs_app dcbnl_app_attr_type_get(u8 selector)
|
||||
{
|
||||
switch (selector) {
|
||||
case IEEE_8021QAZ_APP_SEL_ETHERTYPE:
|
||||
case IEEE_8021QAZ_APP_SEL_STREAM:
|
||||
case IEEE_8021QAZ_APP_SEL_DGRAM:
|
||||
case IEEE_8021QAZ_APP_SEL_ANY:
|
||||
case IEEE_8021QAZ_APP_SEL_DSCP:
|
||||
return DCB_ATTR_IEEE_APP;
|
||||
case DCB_APP_SEL_PCP:
|
||||
return DCB_ATTR_DCB_APP;
|
||||
default:
|
||||
return DCB_ATTR_IEEE_APP_UNSPEC;
|
||||
}
|
||||
}
|
||||
|
||||
static bool dcbnl_app_attr_type_validate(enum ieee_attrs_app type)
|
||||
{
|
||||
switch (type) {
|
||||
case DCB_ATTR_IEEE_APP:
|
||||
case DCB_ATTR_DCB_APP:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static bool dcbnl_app_selector_validate(enum ieee_attrs_app type, u8 selector)
|
||||
{
|
||||
return dcbnl_app_attr_type_get(selector) == type;
|
||||
}
|
||||
|
||||
static struct sk_buff *dcbnl_newmsg(int type, u8 cmd, u32 port, u32 seq,
|
||||
u32 flags, struct nlmsghdr **nlhp)
|
||||
{
|
||||
@ -1030,9 +1063,9 @@ nla_put_failure:
|
||||
/* Handle IEEE 802.1Qaz/802.1Qau/802.1Qbb GET commands. */
|
||||
static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
|
||||
{
|
||||
struct nlattr *ieee, *app;
|
||||
struct dcb_app_type *itr;
|
||||
const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;
|
||||
struct nlattr *ieee, *app, *apptrust;
|
||||
struct dcb_app_type *itr;
|
||||
int dcbx;
|
||||
int err;
|
||||
|
||||
@ -1116,8 +1149,9 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
|
||||
spin_lock_bh(&dcb_lock);
|
||||
list_for_each_entry(itr, &dcb_app_list, list) {
|
||||
if (itr->ifindex == netdev->ifindex) {
|
||||
err = nla_put(skb, DCB_ATTR_IEEE_APP, sizeof(itr->app),
|
||||
&itr->app);
|
||||
enum ieee_attrs_app type =
|
||||
dcbnl_app_attr_type_get(itr->app.selector);
|
||||
err = nla_put(skb, type, sizeof(itr->app), &itr->app);
|
||||
if (err) {
|
||||
spin_unlock_bh(&dcb_lock);
|
||||
return -EMSGSIZE;
|
||||
@ -1133,6 +1167,30 @@ static int dcbnl_ieee_fill(struct sk_buff *skb, struct net_device *netdev)
|
||||
spin_unlock_bh(&dcb_lock);
|
||||
nla_nest_end(skb, app);
|
||||
|
||||
if (ops->dcbnl_getapptrust) {
|
||||
u8 selectors[IEEE_8021QAZ_APP_SEL_MAX + 1] = {0};
|
||||
int nselectors, i;
|
||||
|
||||
apptrust = nla_nest_start(skb, DCB_ATTR_DCB_APP_TRUST_TABLE);
|
||||
if (!apptrust)
|
||||
return -EMSGSIZE;
|
||||
|
||||
err = ops->dcbnl_getapptrust(netdev, selectors, &nselectors);
|
||||
if (!err) {
|
||||
for (i = 0; i < nselectors; i++) {
|
||||
enum ieee_attrs_app type =
|
||||
dcbnl_app_attr_type_get(selectors[i]);
|
||||
err = nla_put_u8(skb, type, selectors[i]);
|
||||
if (err) {
|
||||
nla_nest_cancel(skb, apptrust);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nla_nest_end(skb, apptrust);
|
||||
}
|
||||
|
||||
/* get peer info if available */
|
||||
if (ops->ieee_peer_getets) {
|
||||
struct ieee_ets ets;
|
||||
@ -1493,9 +1551,10 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
|
||||
int rem;
|
||||
|
||||
nla_for_each_nested(attr, ieee[DCB_ATTR_IEEE_APP_TABLE], rem) {
|
||||
enum ieee_attrs_app type = nla_type(attr);
|
||||
struct dcb_app *app_data;
|
||||
|
||||
if (nla_type(attr) != DCB_ATTR_IEEE_APP)
|
||||
if (!dcbnl_app_attr_type_validate(type))
|
||||
continue;
|
||||
|
||||
if (nla_len(attr) < sizeof(struct dcb_app)) {
|
||||
@ -1504,6 +1563,13 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
|
||||
}
|
||||
|
||||
app_data = nla_data(attr);
|
||||
|
||||
if (!dcbnl_app_selector_validate(type,
|
||||
app_data->selector)) {
|
||||
err = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (ops->ieee_setapp)
|
||||
err = ops->ieee_setapp(netdev, app_data);
|
||||
else
|
||||
@ -1513,6 +1579,53 @@ static int dcbnl_ieee_set(struct net_device *netdev, struct nlmsghdr *nlh,
|
||||
}
|
||||
}
|
||||
|
||||
if (ieee[DCB_ATTR_DCB_APP_TRUST_TABLE]) {
|
||||
u8 selectors[IEEE_8021QAZ_APP_SEL_MAX + 1] = {0};
|
||||
struct nlattr *attr;
|
||||
int nselectors = 0;
|
||||
int rem;
|
||||
|
||||
if (!ops->dcbnl_setapptrust) {
|
||||
err = -EOPNOTSUPP;
|
||||
goto err;
|
||||
}
|
||||
|
||||
nla_for_each_nested(attr, ieee[DCB_ATTR_DCB_APP_TRUST_TABLE],
|
||||
rem) {
|
||||
enum ieee_attrs_app type = nla_type(attr);
|
||||
u8 selector;
|
||||
int i;
|
||||
|
||||
if (!dcbnl_app_attr_type_validate(type) ||
|
||||
nla_len(attr) != 1 ||
|
||||
nselectors >= sizeof(selectors)) {
|
||||
err = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
selector = nla_get_u8(attr);
|
||||
|
||||
if (!dcbnl_app_selector_validate(type, selector)) {
|
||||
err = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Duplicate selector ? */
|
||||
for (i = 0; i < nselectors; i++) {
|
||||
if (selectors[i] == selector) {
|
||||
err = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
selectors[nselectors++] = selector;
|
||||
}
|
||||
|
||||
err = ops->dcbnl_setapptrust(netdev, selectors, nselectors);
|
||||
if (err)
|
||||
goto err;
|
||||
}
|
||||
|
||||
err:
|
||||
err = nla_put_u8(skb, DCB_ATTR_IEEE, err);
|
||||
dcbnl_ieee_notify(netdev, RTM_SETDCB, DCB_CMD_IEEE_SET, seq, 0);
|
||||
@ -1554,11 +1667,20 @@ static int dcbnl_ieee_del(struct net_device *netdev, struct nlmsghdr *nlh,
|
||||
int rem;
|
||||
|
||||
nla_for_each_nested(attr, ieee[DCB_ATTR_IEEE_APP_TABLE], rem) {
|
||||
enum ieee_attrs_app type = nla_type(attr);
|
||||
struct dcb_app *app_data;
|
||||
|
||||
if (nla_type(attr) != DCB_ATTR_IEEE_APP)
|
||||
if (!dcbnl_app_attr_type_validate(type))
|
||||
continue;
|
||||
|
||||
app_data = nla_data(attr);
|
||||
|
||||
if (!dcbnl_app_selector_validate(type,
|
||||
app_data->selector)) {
|
||||
err = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (ops->ieee_delapp)
|
||||
err = ops->ieee_delapp(netdev, app_data);
|
||||
else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user