@@ -291,6 +291,7 @@ struct dsa_port {
struct device_node *dn;
unsigned int ageing_time;
+ bool bridge_offloading;
struct dsa_bridge *bridge;
struct devlink_port devlink_port;
@@ -298,6 +298,31 @@ void dsa_devlink_region_destroy(struct devlink_region *region)
}
EXPORT_SYMBOL_GPL(dsa_devlink_region_destroy);
+static void
+dsa_devlink_port_bridge_offload_get(struct devlink_port *dlp,
+ bool *is_enable)
+{
+ struct dsa_port *dp = dsa_to_port(dsa_devlink_port_to_ds(dlp),
+ dsa_devlink_port_to_port(dlp));
+
+ *is_enable = dp->bridge_offloading;
+}
+
+static void
+dsa_devlink_port_bridge_offload_set(struct devlink_port *dlp,
+ bool enable)
+{
+ struct dsa_port *dp = dsa_to_port(dsa_devlink_port_to_ds(dlp),
+ dsa_devlink_port_to_port(dlp));
+
+ dp->bridge_offloading = enable;
+}
+
+static const struct devlink_port_ops dsa_devlink_port_ops = {
+ .port_fn_bridge_offload_get = dsa_devlink_port_bridge_offload_get,
+ .port_fn_bridge_offload_set = dsa_devlink_port_bridge_offload_set,
+};
+
int dsa_port_devlink_setup(struct dsa_port *dp)
{
struct devlink_port *dlp = &dp->devlink_port;
@@ -341,7 +366,7 @@ int dsa_port_devlink_setup(struct dsa_port *dp)
}
devlink_port_attrs_set(dlp, &attrs);
- err = devlink_port_register(dl, dlp, dp->index);
+ err = devlink_port_register_with_ops(dl, dlp, dp->index, &dsa_devlink_port_ops);
if (err) {
if (ds->ops->port_teardown)
ds->ops->port_teardown(ds, dp->index);
@@ -529,6 +529,7 @@ static int dsa_port_setup(struct dsa_port *dp)
return err;
}
+ dp->bridge_offloading = true;
dp->setup = true;
return 0;
@@ -493,7 +493,8 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br,
struct net_device *brport_dev;
int err;
- if (br_mst_enabled(br) && !dsa_port_supports_mst(dp))
+ if ((br_mst_enabled(br) && !dsa_port_supports_mst(dp)) ||
+ !dp->bridge_offloading)
return -EOPNOTSUPP;
/* Here the interface is already bridged. Reflect the current
Currently the DSA framework will HW offload any bridge port if there is a driver available to support HW offloading. This may not always be the preferred case. In cases where the ports on the switch chip are being used as purely L3 interfaces, it is preferred that every packet hits the CPU. In the case where these ports are added to a bridge, there is a likelihood of packets completely bypassing the CPU and being switched. This scenario will occur when a L3 port is added to bridge with an L2/L3 port, and both ports happen to be attached to the CPU via a switch-chip. This will result in the switch chip bridging traffic in hardware, where in some cases it would be preferred that packets entering the L3 port always hit the CPU, for various userland operations like packet inspection etc. To prevent this, make the DSA framework aware of the devlink port function attr, bridge_offload, and add a matching field to the port struct. Add get/set functions to configure the field, and read the field when adding a port to a bridge in HW. Signed-off-by: Aryan Srivastava <aryan.srivastava@alliedtelesis.co.nz> --- include/net/dsa.h | 1 + net/dsa/devlink.c | 27 ++++++++++++++++++++++++++- net/dsa/dsa.c | 1 + net/dsa/port.c | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-)