[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250120004913.2154398-3-aryan.srivastava@alliedtelesis.co.nz>
Date: Mon, 20 Jan 2025 13:49:12 +1300
From: Aryan Srivastava <aryan.srivastava@...iedtelesis.co.nz>
To: Jiri Pirko <jiri@...nulli.us>,
Andrew Lunn <andrew@...n.ch>
Cc: netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
Aryan Srivastava <aryan.srivastava@...iedtelesis.co.nz>,
Vladimir Oltean <olteanv@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Simon Horman <horms@...nel.org>
Subject: [RFC net-next v1 2/2] net: dsa: add option for bridge port HW offload
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 it is preferred that all traffic still
hit the CPU, do software bridging instead.
To prevent HW bridging (and potential CPU bypass), 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 use this field to condition HW config for
offloading a bridge port.
Signed-off-by: Aryan Srivastava <aryan.srivastava@...iedtelesis.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(-)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index a0a9481c52c2..9ee2d7ccfff8 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -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;
diff --git a/net/dsa/devlink.c b/net/dsa/devlink.c
index f41f9fc2194e..dc98e5311921 100644
--- a/net/dsa/devlink.c
+++ b/net/dsa/devlink.c
@@ -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);
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 5a7c0e565a89..20cf55bd42db 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -529,6 +529,7 @@ static int dsa_port_setup(struct dsa_port *dp)
return err;
}
+ dp->bridge_offloading = true;
dp->setup = true;
return 0;
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 5c9d1798e830..de176f7993d0 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -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
--
2.47.1
Powered by blists - more mailing lists