net: dsa: mv88e6xxx: add RXNFC support
Implement the .get_rxnfc and .set_rxnfc DSA operations to configure a port's Layer 2 Policy Control List (PCL) via ethtool. Currently only dropping frames based on MAC Destination or Source Address (including the option VLAN parameter) is supported. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot
David S. Miller
parent
f3a2cd326e
commit
da7dc87553
|
|
@ -1524,6 +1524,216 @@ static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,
|
|||
return mv88e6xxx_g1_atu_loadpurge(chip, fid, &entry);
|
||||
}
|
||||
|
||||
static int mv88e6xxx_policy_apply(struct mv88e6xxx_chip *chip, int port,
|
||||
const struct mv88e6xxx_policy *policy)
|
||||
{
|
||||
enum mv88e6xxx_policy_mapping mapping = policy->mapping;
|
||||
enum mv88e6xxx_policy_action action = policy->action;
|
||||
const u8 *addr = policy->addr;
|
||||
u16 vid = policy->vid;
|
||||
u8 state;
|
||||
int err;
|
||||
int id;
|
||||
|
||||
if (!chip->info->ops->port_set_policy)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
switch (mapping) {
|
||||
case MV88E6XXX_POLICY_MAPPING_DA:
|
||||
case MV88E6XXX_POLICY_MAPPING_SA:
|
||||
if (action == MV88E6XXX_POLICY_ACTION_NORMAL)
|
||||
state = 0; /* Dissociate the port and address */
|
||||
else if (action == MV88E6XXX_POLICY_ACTION_DISCARD &&
|
||||
is_multicast_ether_addr(addr))
|
||||
state = MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_POLICY;
|
||||
else if (action == MV88E6XXX_POLICY_ACTION_DISCARD &&
|
||||
is_unicast_ether_addr(addr))
|
||||
state = MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_POLICY;
|
||||
else
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
|
||||
state);
|
||||
if (err)
|
||||
return err;
|
||||
break;
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
/* Skip the port's policy clearing if the mapping is still in use */
|
||||
if (action == MV88E6XXX_POLICY_ACTION_NORMAL)
|
||||
idr_for_each_entry(&chip->policies, policy, id)
|
||||
if (policy->port == port &&
|
||||
policy->mapping == mapping &&
|
||||
policy->action != action)
|
||||
return 0;
|
||||
|
||||
return chip->info->ops->port_set_policy(chip, port, mapping, action);
|
||||
}
|
||||
|
||||
static int mv88e6xxx_policy_insert(struct mv88e6xxx_chip *chip, int port,
|
||||
struct ethtool_rx_flow_spec *fs)
|
||||
{
|
||||
struct ethhdr *mac_entry = &fs->h_u.ether_spec;
|
||||
struct ethhdr *mac_mask = &fs->m_u.ether_spec;
|
||||
enum mv88e6xxx_policy_mapping mapping;
|
||||
enum mv88e6xxx_policy_action action;
|
||||
struct mv88e6xxx_policy *policy;
|
||||
u16 vid = 0;
|
||||
u8 *addr;
|
||||
int err;
|
||||
int id;
|
||||
|
||||
if (fs->location != RX_CLS_LOC_ANY)
|
||||
return -EINVAL;
|
||||
|
||||
if (fs->ring_cookie == RX_CLS_FLOW_DISC)
|
||||
action = MV88E6XXX_POLICY_ACTION_DISCARD;
|
||||
else
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
switch (fs->flow_type & ~FLOW_EXT) {
|
||||
case ETHER_FLOW:
|
||||
if (!is_zero_ether_addr(mac_mask->h_dest) &&
|
||||
is_zero_ether_addr(mac_mask->h_source)) {
|
||||
mapping = MV88E6XXX_POLICY_MAPPING_DA;
|
||||
addr = mac_entry->h_dest;
|
||||
} else if (is_zero_ether_addr(mac_mask->h_dest) &&
|
||||
!is_zero_ether_addr(mac_mask->h_source)) {
|
||||
mapping = MV88E6XXX_POLICY_MAPPING_SA;
|
||||
addr = mac_entry->h_source;
|
||||
} else {
|
||||
/* Cannot support DA and SA mapping in the same rule */
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
if ((fs->flow_type & FLOW_EXT) && fs->m_ext.vlan_tci) {
|
||||
if (fs->m_ext.vlan_tci != 0xffff)
|
||||
return -EOPNOTSUPP;
|
||||
vid = be16_to_cpu(fs->h_ext.vlan_tci) & VLAN_VID_MASK;
|
||||
}
|
||||
|
||||
idr_for_each_entry(&chip->policies, policy, id) {
|
||||
if (policy->port == port && policy->mapping == mapping &&
|
||||
policy->action == action && policy->vid == vid &&
|
||||
ether_addr_equal(policy->addr, addr))
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
policy = devm_kzalloc(chip->dev, sizeof(*policy), GFP_KERNEL);
|
||||
if (!policy)
|
||||
return -ENOMEM;
|
||||
|
||||
fs->location = 0;
|
||||
err = idr_alloc_u32(&chip->policies, policy, &fs->location, 0xffffffff,
|
||||
GFP_KERNEL);
|
||||
if (err) {
|
||||
devm_kfree(chip->dev, policy);
|
||||
return err;
|
||||
}
|
||||
|
||||
memcpy(&policy->fs, fs, sizeof(*fs));
|
||||
ether_addr_copy(policy->addr, addr);
|
||||
policy->mapping = mapping;
|
||||
policy->action = action;
|
||||
policy->port = port;
|
||||
policy->vid = vid;
|
||||
|
||||
err = mv88e6xxx_policy_apply(chip, port, policy);
|
||||
if (err) {
|
||||
idr_remove(&chip->policies, fs->location);
|
||||
devm_kfree(chip->dev, policy);
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mv88e6xxx_get_rxnfc(struct dsa_switch *ds, int port,
|
||||
struct ethtool_rxnfc *rxnfc, u32 *rule_locs)
|
||||
{
|
||||
struct ethtool_rx_flow_spec *fs = &rxnfc->fs;
|
||||
struct mv88e6xxx_chip *chip = ds->priv;
|
||||
struct mv88e6xxx_policy *policy;
|
||||
int err;
|
||||
int id;
|
||||
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
switch (rxnfc->cmd) {
|
||||
case ETHTOOL_GRXCLSRLCNT:
|
||||
rxnfc->data = 0;
|
||||
rxnfc->data |= RX_CLS_LOC_SPECIAL;
|
||||
rxnfc->rule_cnt = 0;
|
||||
idr_for_each_entry(&chip->policies, policy, id)
|
||||
if (policy->port == port)
|
||||
rxnfc->rule_cnt++;
|
||||
err = 0;
|
||||
break;
|
||||
case ETHTOOL_GRXCLSRULE:
|
||||
err = -ENOENT;
|
||||
policy = idr_find(&chip->policies, fs->location);
|
||||
if (policy) {
|
||||
memcpy(fs, &policy->fs, sizeof(*fs));
|
||||
err = 0;
|
||||
}
|
||||
break;
|
||||
case ETHTOOL_GRXCLSRLALL:
|
||||
rxnfc->data = 0;
|
||||
rxnfc->rule_cnt = 0;
|
||||
idr_for_each_entry(&chip->policies, policy, id)
|
||||
if (policy->port == port)
|
||||
rule_locs[rxnfc->rule_cnt++] = id;
|
||||
err = 0;
|
||||
break;
|
||||
default:
|
||||
err = -EOPNOTSUPP;
|
||||
break;
|
||||
}
|
||||
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mv88e6xxx_set_rxnfc(struct dsa_switch *ds, int port,
|
||||
struct ethtool_rxnfc *rxnfc)
|
||||
{
|
||||
struct ethtool_rx_flow_spec *fs = &rxnfc->fs;
|
||||
struct mv88e6xxx_chip *chip = ds->priv;
|
||||
struct mv88e6xxx_policy *policy;
|
||||
int err;
|
||||
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
switch (rxnfc->cmd) {
|
||||
case ETHTOOL_SRXCLSRLINS:
|
||||
err = mv88e6xxx_policy_insert(chip, port, fs);
|
||||
break;
|
||||
case ETHTOOL_SRXCLSRLDEL:
|
||||
err = -ENOENT;
|
||||
policy = idr_remove(&chip->policies, fs->location);
|
||||
if (policy) {
|
||||
policy->action = MV88E6XXX_POLICY_ACTION_NORMAL;
|
||||
err = mv88e6xxx_policy_apply(chip, port, policy);
|
||||
devm_kfree(chip->dev, policy);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
err = -EOPNOTSUPP;
|
||||
break;
|
||||
}
|
||||
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mv88e6xxx_port_add_broadcast(struct mv88e6xxx_chip *chip, int port,
|
||||
u16 vid)
|
||||
{
|
||||
|
|
@ -4655,6 +4865,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
|
|||
|
||||
mutex_init(&chip->reg_lock);
|
||||
INIT_LIST_HEAD(&chip->mdios);
|
||||
idr_init(&chip->policies);
|
||||
|
||||
return chip;
|
||||
}
|
||||
|
|
@ -4739,6 +4950,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
|
|||
.set_eeprom = mv88e6xxx_set_eeprom,
|
||||
.get_regs_len = mv88e6xxx_get_regs_len,
|
||||
.get_regs = mv88e6xxx_get_regs,
|
||||
.get_rxnfc = mv88e6xxx_get_rxnfc,
|
||||
.set_rxnfc = mv88e6xxx_set_rxnfc,
|
||||
.set_ageing_time = mv88e6xxx_set_ageing_time,
|
||||
.port_bridge_join = mv88e6xxx_port_bridge_join,
|
||||
.port_bridge_leave = mv88e6xxx_port_bridge_leave,
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#ifndef _MV88E6XXX_CHIP_H
|
||||
#define _MV88E6XXX_CHIP_H
|
||||
|
||||
#include <linux/idr.h>
|
||||
#include <linux/if_vlan.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
|
|
@ -207,6 +208,15 @@ enum mv88e6xxx_policy_action {
|
|||
MV88E6XXX_POLICY_ACTION_DISCARD,
|
||||
};
|
||||
|
||||
struct mv88e6xxx_policy {
|
||||
enum mv88e6xxx_policy_mapping mapping;
|
||||
enum mv88e6xxx_policy_action action;
|
||||
struct ethtool_rx_flow_spec fs;
|
||||
u8 addr[ETH_ALEN];
|
||||
int port;
|
||||
u16 vid;
|
||||
};
|
||||
|
||||
struct mv88e6xxx_port {
|
||||
struct mv88e6xxx_chip *chip;
|
||||
int port;
|
||||
|
|
@ -265,6 +275,9 @@ struct mv88e6xxx_chip {
|
|||
/* List of mdio busses */
|
||||
struct list_head mdios;
|
||||
|
||||
/* Policy Control List IDs and rules */
|
||||
struct idr policies;
|
||||
|
||||
/* There can be two interrupt controllers, which are chained
|
||||
* off a GPIO as interrupt source
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue