Merge branch 'net-ti-storm-prevention-support'
Grygorii Strashko says:
====================
net: ethernet: ti: enable bc/mc storm prevention support
This series first adds supports for the ALE feature to rate limit number ingress
broadcast(BC)/multicast(MC) packets per/sec which main purpose is BC/MC storm
prevention.
And then enables corresponding support for ingress broadcast(BC)/multicast(MC)
packets rate limiting for TI CPSW switchdev and AM65x/J221E CPSW_NUSS drivers by
implementing HW offload for simple tc-flower with policer action with matches
on dst_mac/mask:
- ff:ff:ff:ff:ff:ff/ff:ff:ff:ff:ff:ff has to be used for BC packets rate
limiting (exact match)
- 01:00:00:00:00:00/01:00:00:00:00:00 fixed value has to be used for MC
packets rate limiting
The CPSW supports MC/BC packets rate limiting in packets/sec and affects
all ingress MC/BC packets and serves as BC/MC storm prevention feature.
Examples:
- BC rate limit to 1000pps:
tc qdisc add dev eth0 clsact
tc filter add dev eth0 ingress flower skip_sw dst_mac ff:ff:ff:ff:ff:ff \
action police pkts_rate 1000 pkts_burst 1 drop
- MC rate limit to 20000pps:
tc qdisc add dev eth0 clsact
tc filter add dev eth0 ingress flower skip_sw dst_mac 01:00:00:00:00:00/01:00:00:00:00:00 \
action police rate pkts_rate 20000 pkts_burst 1 drop
pkts_burst - not used.
The solution inspired patch from Vladimir Oltean [1].
Changes in v3:
- comments applied
- policer validation added
Changes in v2:
- switch to packet-per-second policing introduced by
commit 2ffe039528 ("net/sched: act_police: add support for packet-per-second policing") [2]
v2: https://patchwork.kernel.org/project/netdevbpf/cover/20211101170122.19160-1-grygorii.strashko@ti.com/
v1: https://patchwork.kernel.org/project/netdevbpf/cover/20201114035654.32658-1-grygorii.strashko@ti.com/
[1] https://lore.kernel.org/patchwork/patch/1217254/
[2] https://patchwork.kernel.org/project/netdevbpf/cover/20210312140831.23346-1-simon.horman@netronome.com/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
ae10162c7e
|
|
@ -8,10 +8,12 @@
|
|||
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/time.h>
|
||||
#include <net/pkt_cls.h>
|
||||
|
||||
#include "am65-cpsw-nuss.h"
|
||||
#include "am65-cpsw-qos.h"
|
||||
#include "am65-cpts.h"
|
||||
#include "cpsw_ale.h"
|
||||
|
||||
#define AM65_CPSW_REG_CTL 0x004
|
||||
#define AM65_CPSW_PN_REG_CTL 0x004
|
||||
|
|
@ -588,12 +590,190 @@ static int am65_cpsw_setup_taprio(struct net_device *ndev, void *type_data)
|
|||
return am65_cpsw_set_taprio(ndev, type_data);
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_clsflower_add_policer(struct am65_cpsw_port *port,
|
||||
struct netlink_ext_ack *extack,
|
||||
struct flow_cls_offload *cls,
|
||||
u64 rate_pkt_ps)
|
||||
{
|
||||
struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
|
||||
struct flow_dissector *dissector = rule->match.dissector;
|
||||
static const u8 mc_mac[] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
|
||||
struct am65_cpsw_qos *qos = &port->qos;
|
||||
struct flow_match_eth_addrs match;
|
||||
int ret;
|
||||
|
||||
if (dissector->used_keys &
|
||||
~(BIT(FLOW_DISSECTOR_KEY_BASIC) |
|
||||
BIT(FLOW_DISSECTOR_KEY_CONTROL) |
|
||||
BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Unsupported keys used");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "Not matching on eth address");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
flow_rule_match_eth_addrs(rule, &match);
|
||||
|
||||
if (!is_zero_ether_addr(match.mask->src)) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Matching on source MAC not supported");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (is_broadcast_ether_addr(match.key->dst) &&
|
||||
is_broadcast_ether_addr(match.mask->dst)) {
|
||||
ret = cpsw_ale_rx_ratelimit_bc(port->common->ale, port->port_id, rate_pkt_ps);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
qos->ale_bc_ratelimit.cookie = cls->cookie;
|
||||
qos->ale_bc_ratelimit.rate_packet_ps = rate_pkt_ps;
|
||||
} else if (ether_addr_equal_unaligned(match.key->dst, mc_mac) &&
|
||||
ether_addr_equal_unaligned(match.mask->dst, mc_mac)) {
|
||||
ret = cpsw_ale_rx_ratelimit_mc(port->common->ale, port->port_id, rate_pkt_ps);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
qos->ale_mc_ratelimit.cookie = cls->cookie;
|
||||
qos->ale_mc_ratelimit.rate_packet_ps = rate_pkt_ps;
|
||||
} else {
|
||||
NL_SET_ERR_MSG_MOD(extack, "Not supported matching key");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_clsflower_policer_validate(const struct flow_action *action,
|
||||
const struct flow_action_entry *act,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
if (act->police.exceed.act_id != FLOW_ACTION_DROP) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when exceed action is not drop");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&
|
||||
act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when conform action is not pipe or ok");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&
|
||||
!flow_action_is_last_entry(action, act)) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when conform action is ok, but action is not last");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.rate_bytes_ps || act->police.peakrate_bytes_ps ||
|
||||
act->police.avrate || act->police.overhead) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when bytes per second/peakrate/avrate/overhead is configured");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_configure_clsflower(struct am65_cpsw_port *port,
|
||||
struct flow_cls_offload *cls)
|
||||
{
|
||||
struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
|
||||
struct netlink_ext_ack *extack = cls->common.extack;
|
||||
const struct flow_action_entry *act;
|
||||
int i, ret;
|
||||
|
||||
flow_action_for_each(i, act, &rule->action) {
|
||||
switch (act->id) {
|
||||
case FLOW_ACTION_POLICE:
|
||||
ret = am65_cpsw_qos_clsflower_policer_validate(&rule->action, act, extack);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return am65_cpsw_qos_clsflower_add_policer(port, extack, cls,
|
||||
act->police.rate_pkt_ps);
|
||||
default:
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Action not supported");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_delete_clsflower(struct am65_cpsw_port *port, struct flow_cls_offload *cls)
|
||||
{
|
||||
struct am65_cpsw_qos *qos = &port->qos;
|
||||
|
||||
if (cls->cookie == qos->ale_bc_ratelimit.cookie) {
|
||||
qos->ale_bc_ratelimit.cookie = 0;
|
||||
qos->ale_bc_ratelimit.rate_packet_ps = 0;
|
||||
cpsw_ale_rx_ratelimit_bc(port->common->ale, port->port_id, 0);
|
||||
}
|
||||
|
||||
if (cls->cookie == qos->ale_mc_ratelimit.cookie) {
|
||||
qos->ale_mc_ratelimit.cookie = 0;
|
||||
qos->ale_mc_ratelimit.rate_packet_ps = 0;
|
||||
cpsw_ale_rx_ratelimit_mc(port->common->ale, port->port_id, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_setup_tc_clsflower(struct am65_cpsw_port *port,
|
||||
struct flow_cls_offload *cls_flower)
|
||||
{
|
||||
switch (cls_flower->command) {
|
||||
case FLOW_CLS_REPLACE:
|
||||
return am65_cpsw_qos_configure_clsflower(port, cls_flower);
|
||||
case FLOW_CLS_DESTROY:
|
||||
return am65_cpsw_qos_delete_clsflower(port, cls_flower);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
static int am65_cpsw_qos_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)
|
||||
{
|
||||
struct am65_cpsw_port *port = cb_priv;
|
||||
|
||||
if (!tc_cls_can_offload_and_chain0(port->ndev, type_data))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
switch (type) {
|
||||
case TC_SETUP_CLSFLOWER:
|
||||
return am65_cpsw_qos_setup_tc_clsflower(port, type_data);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
static LIST_HEAD(am65_cpsw_qos_block_cb_list);
|
||||
|
||||
static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_block_offload *f)
|
||||
{
|
||||
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
|
||||
|
||||
return flow_block_cb_setup_simple(f, &am65_cpsw_qos_block_cb_list,
|
||||
am65_cpsw_qos_setup_tc_block_cb,
|
||||
port, port, true);
|
||||
}
|
||||
|
||||
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
|
||||
void *type_data)
|
||||
{
|
||||
switch (type) {
|
||||
case TC_SETUP_QDISC_TAPRIO:
|
||||
return am65_cpsw_setup_taprio(ndev, type_data);
|
||||
case TC_SETUP_BLOCK:
|
||||
return am65_cpsw_qos_setup_tc_block(ndev, type_data);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,19 @@ struct am65_cpsw_est {
|
|||
struct tc_taprio_qopt_offload taprio;
|
||||
};
|
||||
|
||||
struct am65_cpsw_ale_ratelimit {
|
||||
unsigned long cookie;
|
||||
u64 rate_packet_ps;
|
||||
};
|
||||
|
||||
struct am65_cpsw_qos {
|
||||
struct am65_cpsw_est *est_admin;
|
||||
struct am65_cpsw_est *est_oper;
|
||||
ktime_t link_down_time;
|
||||
int link_speed;
|
||||
|
||||
struct am65_cpsw_ale_ratelimit ale_bc_ratelimit;
|
||||
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
|
||||
};
|
||||
|
||||
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@
|
|||
/* ALE_AGING_TIMER */
|
||||
#define ALE_AGING_TIMER_MASK GENMASK(23, 0)
|
||||
|
||||
#define ALE_RATE_LIMIT_MIN_PPS 1000
|
||||
|
||||
/**
|
||||
* struct ale_entry_fld - The ALE tbl entry field description
|
||||
* @start_bit: field start bit
|
||||
|
|
@ -1136,6 +1138,50 @@ int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control)
|
|||
return tmp & BITMASK(info->bits);
|
||||
}
|
||||
|
||||
int cpsw_ale_rx_ratelimit_mc(struct cpsw_ale *ale, int port, unsigned int ratelimit_pps)
|
||||
|
||||
{
|
||||
int val = ratelimit_pps / ALE_RATE_LIMIT_MIN_PPS;
|
||||
u32 remainder = ratelimit_pps % ALE_RATE_LIMIT_MIN_PPS;
|
||||
|
||||
if (ratelimit_pps && !val) {
|
||||
dev_err(ale->params.dev, "ALE MC port:%d ratelimit min value 1000pps\n", port);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (remainder)
|
||||
dev_info(ale->params.dev, "ALE port:%d MC ratelimit set to %dpps (requested %d)\n",
|
||||
port, ratelimit_pps - remainder, ratelimit_pps);
|
||||
|
||||
cpsw_ale_control_set(ale, port, ALE_PORT_MCAST_LIMIT, val);
|
||||
|
||||
dev_dbg(ale->params.dev, "ALE port:%d MC ratelimit set %d\n",
|
||||
port, val * ALE_RATE_LIMIT_MIN_PPS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cpsw_ale_rx_ratelimit_bc(struct cpsw_ale *ale, int port, unsigned int ratelimit_pps)
|
||||
|
||||
{
|
||||
int val = ratelimit_pps / ALE_RATE_LIMIT_MIN_PPS;
|
||||
u32 remainder = ratelimit_pps % ALE_RATE_LIMIT_MIN_PPS;
|
||||
|
||||
if (ratelimit_pps && !val) {
|
||||
dev_err(ale->params.dev, "ALE port:%d BC ratelimit min value 1000pps\n", port);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (remainder)
|
||||
dev_info(ale->params.dev, "ALE port:%d BC ratelimit set to %dpps (requested %d)\n",
|
||||
port, ratelimit_pps - remainder, ratelimit_pps);
|
||||
|
||||
cpsw_ale_control_set(ale, port, ALE_PORT_BCAST_LIMIT, val);
|
||||
|
||||
dev_dbg(ale->params.dev, "ALE port:%d BC ratelimit set %d\n",
|
||||
port, val * ALE_RATE_LIMIT_MIN_PPS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void cpsw_ale_timer(struct timer_list *t)
|
||||
{
|
||||
struct cpsw_ale *ale = from_timer(ale, t, timer);
|
||||
|
|
@ -1199,6 +1245,26 @@ static void cpsw_ale_aging_stop(struct cpsw_ale *ale)
|
|||
|
||||
void cpsw_ale_start(struct cpsw_ale *ale)
|
||||
{
|
||||
unsigned long ale_prescale;
|
||||
|
||||
/* configure Broadcast and Multicast Rate Limit
|
||||
* number_of_packets = (Fclk / ALE_PRESCALE) * port.BCAST/MCAST_LIMIT
|
||||
* ALE_PRESCALE width is 19bit and min value 0x10
|
||||
* port.BCAST/MCAST_LIMIT is 8bit
|
||||
*
|
||||
* For multi port configuration support the ALE_PRESCALE is configured to 1ms interval,
|
||||
* which allows to configure port.BCAST/MCAST_LIMIT per port and achieve:
|
||||
* min number_of_packets = 1000 when port.BCAST/MCAST_LIMIT = 1
|
||||
* max number_of_packets = 1000 * 255 = 255000 when port.BCAST/MCAST_LIMIT = 0xFF
|
||||
*/
|
||||
ale_prescale = ale->params.bus_freq / ALE_RATE_LIMIT_MIN_PPS;
|
||||
writel((u32)ale_prescale, ale->params.ale_regs + ALE_PRESCALE);
|
||||
|
||||
/* Allow MC/BC rate limiting globally.
|
||||
* The actual Rate Limit cfg enabled per-port by port.BCAST/MCAST_LIMIT
|
||||
*/
|
||||
cpsw_ale_control_set(ale, 0, ALE_RATE_LIMIT, 1);
|
||||
|
||||
cpsw_ale_control_set(ale, 0, ALE_ENABLE, 1);
|
||||
cpsw_ale_control_set(ale, 0, ALE_CLEAR, 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@ int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port, int untag,
|
|||
int reg_mcast, int unreg_mcast);
|
||||
int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port);
|
||||
void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti, int port);
|
||||
int cpsw_ale_rx_ratelimit_bc(struct cpsw_ale *ale, int port, unsigned int ratelimit_pps);
|
||||
int cpsw_ale_rx_ratelimit_mc(struct cpsw_ale *ale, int port, unsigned int ratelimit_pps);
|
||||
|
||||
int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control);
|
||||
int cpsw_ale_control_set(struct cpsw_ale *ale, int port,
|
||||
|
|
|
|||
|
|
@ -498,6 +498,8 @@ static void cpsw_restore(struct cpsw_priv *priv)
|
|||
|
||||
/* restore CBS offload */
|
||||
cpsw_cbs_resume(&cpsw->slaves[priv->emac_port - 1], priv);
|
||||
|
||||
cpsw_qos_clsflower_resume(priv);
|
||||
}
|
||||
|
||||
static void cpsw_init_stp_ale_entry(struct cpsw_common *cpsw)
|
||||
|
|
@ -1407,7 +1409,7 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)
|
|||
cpsw->slaves[i].ndev = ndev;
|
||||
|
||||
ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER |
|
||||
NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_NETNS_LOCAL;
|
||||
NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_NETNS_LOCAL | NETIF_F_HW_TC;
|
||||
|
||||
ndev->netdev_ops = &cpsw_netdev_ops;
|
||||
ndev->ethtool_ops = &cpsw_ethtool_ops;
|
||||
|
|
|
|||
|
|
@ -502,6 +502,7 @@ int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,
|
|||
ale_params.ale_ageout = ale_ageout;
|
||||
ale_params.ale_ports = CPSW_ALE_PORTS_NUM;
|
||||
ale_params.dev_id = "cpsw";
|
||||
ale_params.bus_freq = cpsw->bus_freq_mhz * 1000000;
|
||||
|
||||
cpsw->ale = cpsw_ale_create(&ale_params);
|
||||
if (IS_ERR(cpsw->ale)) {
|
||||
|
|
@ -1048,6 +1049,8 @@ static int cpsw_set_mqprio(struct net_device *ndev, void *type_data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_block_offload *f);
|
||||
|
||||
int cpsw_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
|
||||
void *type_data)
|
||||
{
|
||||
|
|
@ -1058,6 +1061,9 @@ int cpsw_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
|
|||
case TC_SETUP_QDISC_MQPRIO:
|
||||
return cpsw_set_mqprio(ndev, type_data);
|
||||
|
||||
case TC_SETUP_BLOCK:
|
||||
return cpsw_qos_setup_tc_block(ndev, type_data);
|
||||
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
|
@ -1381,3 +1387,202 @@ drop:
|
|||
page_pool_recycle_direct(cpsw->page_pool[ch], page);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cpsw_qos_clsflower_add_policer(struct cpsw_priv *priv,
|
||||
struct netlink_ext_ack *extack,
|
||||
struct flow_cls_offload *cls,
|
||||
u64 rate_pkt_ps)
|
||||
{
|
||||
struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
|
||||
struct flow_dissector *dissector = rule->match.dissector;
|
||||
static const u8 mc_mac[] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00};
|
||||
struct flow_match_eth_addrs match;
|
||||
u32 port_id;
|
||||
int ret;
|
||||
|
||||
if (dissector->used_keys &
|
||||
~(BIT(FLOW_DISSECTOR_KEY_BASIC) |
|
||||
BIT(FLOW_DISSECTOR_KEY_CONTROL) |
|
||||
BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Unsupported keys used");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "Not matching on eth address");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
flow_rule_match_eth_addrs(rule, &match);
|
||||
|
||||
if (!is_zero_ether_addr(match.mask->src)) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Matching on source MAC not supported");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
port_id = cpsw_slave_index(priv->cpsw, priv) + 1;
|
||||
|
||||
if (is_broadcast_ether_addr(match.key->dst) &&
|
||||
is_broadcast_ether_addr(match.mask->dst)) {
|
||||
ret = cpsw_ale_rx_ratelimit_bc(priv->cpsw->ale, port_id, rate_pkt_ps);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
priv->ale_bc_ratelimit.cookie = cls->cookie;
|
||||
priv->ale_bc_ratelimit.rate_packet_ps = rate_pkt_ps;
|
||||
} else if (ether_addr_equal_unaligned(match.key->dst, mc_mac) &&
|
||||
ether_addr_equal_unaligned(match.mask->dst, mc_mac)) {
|
||||
ret = cpsw_ale_rx_ratelimit_mc(priv->cpsw->ale, port_id, rate_pkt_ps);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
priv->ale_mc_ratelimit.cookie = cls->cookie;
|
||||
priv->ale_mc_ratelimit.rate_packet_ps = rate_pkt_ps;
|
||||
} else {
|
||||
NL_SET_ERR_MSG_MOD(extack, "Not supported matching key");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cpsw_qos_clsflower_policer_validate(const struct flow_action *action,
|
||||
const struct flow_action_entry *act,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
if (act->police.exceed.act_id != FLOW_ACTION_DROP) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when exceed action is not drop");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&
|
||||
act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when conform action is not pipe or ok");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&
|
||||
!flow_action_is_last_entry(action, act)) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when conform action is ok, but action is not last");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if (act->police.rate_bytes_ps || act->police.peakrate_bytes_ps ||
|
||||
act->police.avrate || act->police.overhead) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Offload not supported when bytes per second/peakrate/avrate/overhead is configured");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cpsw_qos_configure_clsflower(struct cpsw_priv *priv, struct flow_cls_offload *cls)
|
||||
{
|
||||
struct flow_rule *rule = flow_cls_offload_flow_rule(cls);
|
||||
struct netlink_ext_ack *extack = cls->common.extack;
|
||||
const struct flow_action_entry *act;
|
||||
int i, ret;
|
||||
|
||||
flow_action_for_each(i, act, &rule->action) {
|
||||
switch (act->id) {
|
||||
case FLOW_ACTION_POLICE:
|
||||
ret = cpsw_qos_clsflower_policer_validate(&rule->action, act, extack);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return cpsw_qos_clsflower_add_policer(priv, extack, cls,
|
||||
act->police.rate_pkt_ps);
|
||||
default:
|
||||
NL_SET_ERR_MSG_MOD(extack, "Action not supported");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static int cpsw_qos_delete_clsflower(struct cpsw_priv *priv, struct flow_cls_offload *cls)
|
||||
{
|
||||
u32 port_id = cpsw_slave_index(priv->cpsw, priv) + 1;
|
||||
|
||||
if (cls->cookie == priv->ale_bc_ratelimit.cookie) {
|
||||
priv->ale_bc_ratelimit.cookie = 0;
|
||||
priv->ale_bc_ratelimit.rate_packet_ps = 0;
|
||||
cpsw_ale_rx_ratelimit_bc(priv->cpsw->ale, port_id, 0);
|
||||
}
|
||||
|
||||
if (cls->cookie == priv->ale_mc_ratelimit.cookie) {
|
||||
priv->ale_mc_ratelimit.cookie = 0;
|
||||
priv->ale_mc_ratelimit.rate_packet_ps = 0;
|
||||
cpsw_ale_rx_ratelimit_mc(priv->cpsw->ale, port_id, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cpsw_qos_setup_tc_clsflower(struct cpsw_priv *priv, struct flow_cls_offload *cls_flower)
|
||||
{
|
||||
switch (cls_flower->command) {
|
||||
case FLOW_CLS_REPLACE:
|
||||
return cpsw_qos_configure_clsflower(priv, cls_flower);
|
||||
case FLOW_CLS_DESTROY:
|
||||
return cpsw_qos_delete_clsflower(priv, cls_flower);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
static int cpsw_qos_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)
|
||||
{
|
||||
struct cpsw_priv *priv = cb_priv;
|
||||
int ret;
|
||||
|
||||
if (!tc_cls_can_offload_and_chain0(priv->ndev, type_data))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = pm_runtime_get_sync(priv->dev);
|
||||
if (ret < 0) {
|
||||
pm_runtime_put_noidle(priv->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case TC_SETUP_CLSFLOWER:
|
||||
ret = cpsw_qos_setup_tc_clsflower(priv, type_data);
|
||||
break;
|
||||
default:
|
||||
ret = -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
pm_runtime_put(priv->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static LIST_HEAD(cpsw_qos_block_cb_list);
|
||||
|
||||
static int cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_block_offload *f)
|
||||
{
|
||||
struct cpsw_priv *priv = netdev_priv(ndev);
|
||||
|
||||
return flow_block_cb_setup_simple(f, &cpsw_qos_block_cb_list,
|
||||
cpsw_qos_setup_tc_block_cb,
|
||||
priv, priv, true);
|
||||
}
|
||||
|
||||
void cpsw_qos_clsflower_resume(struct cpsw_priv *priv)
|
||||
{
|
||||
u32 port_id = cpsw_slave_index(priv->cpsw, priv) + 1;
|
||||
|
||||
if (priv->ale_bc_ratelimit.cookie)
|
||||
cpsw_ale_rx_ratelimit_bc(priv->cpsw->ale, port_id,
|
||||
priv->ale_bc_ratelimit.rate_packet_ps);
|
||||
|
||||
if (priv->ale_mc_ratelimit.cookie)
|
||||
cpsw_ale_rx_ratelimit_mc(priv->cpsw->ale, port_id,
|
||||
priv->ale_mc_ratelimit.rate_packet_ps);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -364,6 +364,11 @@ struct cpsw_common {
|
|||
u8 base_mac[ETH_ALEN];
|
||||
};
|
||||
|
||||
struct cpsw_ale_ratelimit {
|
||||
unsigned long cookie;
|
||||
u64 rate_packet_ps;
|
||||
};
|
||||
|
||||
struct cpsw_priv {
|
||||
struct net_device *ndev;
|
||||
struct device *dev;
|
||||
|
|
@ -384,6 +389,8 @@ struct cpsw_priv {
|
|||
struct cpsw_common *cpsw;
|
||||
int offload_fwd_mark;
|
||||
u32 tx_packet_min;
|
||||
struct cpsw_ale_ratelimit ale_bc_ratelimit;
|
||||
struct cpsw_ale_ratelimit ale_mc_ratelimit;
|
||||
};
|
||||
|
||||
#define ndev_to_cpsw(ndev) (((struct cpsw_priv *)netdev_priv(ndev))->cpsw)
|
||||
|
|
@ -461,6 +468,7 @@ int cpsw_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
|
|||
bool cpsw_shp_is_off(struct cpsw_priv *priv);
|
||||
void cpsw_cbs_resume(struct cpsw_slave *slave, struct cpsw_priv *priv);
|
||||
void cpsw_mqprio_resume(struct cpsw_slave *slave, struct cpsw_priv *priv);
|
||||
void cpsw_qos_clsflower_resume(struct cpsw_priv *priv);
|
||||
|
||||
/* ethtool */
|
||||
u32 cpsw_get_msglevel(struct net_device *ndev);
|
||||
|
|
|
|||
Loading…
Reference in New Issue