lkml.org 
[lkml]   [2022]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH net-next v3 1/2] macsec: add support for IFLA_MACSEC_OFFLOAD in macsec_changelink
Wed, Dec 07, 2022 at 11:10:16AM CET, ehakim@nvidia.com wrote:
>From: Emeel Hakim <ehakim@nvidia.com>
>
>Add support for changing Macsec offload selection through the
>netlink layer by implementing the relevant changes in
>macsec_change link.
>
>Since the handling in macsec_changelink is similar to macsec_upd_offload,
>update macsec_upd_offload to use a common helper function to avoid
>duplication.
>
>Example for setting offload for a macsec device:
> ip link set macsec0 type macsec offload mac
>
>Reviewed-by: Raed Salem <raeds@nvidia.com>
>Signed-off-by: Emeel Hakim <ehakim@nvidia.com>
>---
>V2 -> V3: - Split the original patch into 3 patches, the macsec_rtnl_policy related change (separate patch)
> to be sent to "net" branch as a fix.
> - Change the original patch title to make it clear that it's only adding IFLA_MACSEC_OFFLOAD
> to changelink
>V1 -> V2: Add common helper to avoid duplicating code
>
> drivers/net/macsec.c | 102 +++++++++++++++++++++++++++----------------
> 1 file changed, 64 insertions(+), 38 deletions(-)
>
>diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
>index d73b9d535b7a..1850a1ee4380 100644
>--- a/drivers/net/macsec.c
>+++ b/drivers/net/macsec.c
>@@ -2583,16 +2583,45 @@ static bool macsec_is_configured(struct macsec_dev *macsec)
> return false;
> }
>
>+static int macsec_update_offload(struct macsec_dev *macsec, enum macsec_offload offload)
>+{
>+ enum macsec_offload prev_offload;
>+ const struct macsec_ops *ops;
>+ struct macsec_context ctx;
>+ int ret = 0;
>+
>+ prev_offload = macsec->offload;
>+
>+ /* Check if the device already has rules configured: we do not support
>+ * rules migration.
>+ */
>+ if (macsec_is_configured(macsec))
>+ return -EBUSY;
>+
>+ ops = __macsec_get_ops(offload == MACSEC_OFFLOAD_OFF ? prev_offload : offload,
>+ macsec, &ctx);
>+ if (!ops)
>+ return -EOPNOTSUPP;
>+
>+ macsec->offload = offload;
>+
>+ ctx.secy = &macsec->secy;
>+ ret = (offload == MACSEC_OFFLOAD_OFF) ? macsec_offload(ops->mdo_del_secy, &ctx) :
>+ macsec_offload(ops->mdo_add_secy, &ctx);
>+
>+ if (ret)
>+ macsec->offload = prev_offload;
>+
>+ return ret;
>+}
>+
> static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)
> {
> struct nlattr *tb_offload[MACSEC_OFFLOAD_ATTR_MAX + 1];
>- enum macsec_offload offload, prev_offload;
>- int (*func)(struct macsec_context *ctx);
> struct nlattr **attrs = info->attrs;
>- struct net_device *dev;
>- const struct macsec_ops *ops;
>- struct macsec_context ctx;
>+ enum macsec_offload offload;
> struct macsec_dev *macsec;
>+ struct net_device *dev;
> int ret;
>
> if (!attrs[MACSEC_ATTR_IFINDEX])
>@@ -2629,39 +2658,7 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)
>
> rtnl_lock();
>
>- prev_offload = macsec->offload;
>- macsec->offload = offload;
>-
>- /* Check if the device already has rules configured: we do not support
>- * rules migration.
>- */
>- if (macsec_is_configured(macsec)) {
>- ret = -EBUSY;
>- goto rollback;
>- }
>-
>- ops = __macsec_get_ops(offload == MACSEC_OFFLOAD_OFF ? prev_offload : offload,
>- macsec, &ctx);
>- if (!ops) {
>- ret = -EOPNOTSUPP;
>- goto rollback;
>- }
>-
>- if (prev_offload == MACSEC_OFFLOAD_OFF)
>- func = ops->mdo_add_secy;
>- else
>- func = ops->mdo_del_secy;
>-
>- ctx.secy = &macsec->secy;
>- ret = macsec_offload(func, &ctx);
>- if (ret)
>- goto rollback;
>-
>- rtnl_unlock();
>- return 0;
>-
>-rollback:
>- macsec->offload = prev_offload;
>+ ret = macsec_update_offload(macsec, offload);
>
> rtnl_unlock();
> return ret;
>@@ -3803,6 +3800,29 @@ static int macsec_changelink_common(struct net_device *dev,
> return 0;
> }
>
>+static int macsec_changelink_upd_offload(struct net_device *dev, struct nlattr *data[])

Only data[IFLA_MACSEC_OFFLOAD] is used there. Pass just this attr.


>+{
>+ enum macsec_offload offload;
>+ struct macsec_dev *macsec;
>+
>+ macsec = macsec_priv(dev);
>+ offload = nla_get_u8(data[IFLA_MACSEC_OFFLOAD]);
>+
>+ if (macsec->offload == offload)
>+ return 0;
>+
>+ /* Check if the offloading mode is supported by the underlying layers */
>+ if (offload != MACSEC_OFFLOAD_OFF &&
>+ !macsec_check_offload(offload, macsec))
>+ return -EOPNOTSUPP;
>+
>+ /* Check if the net device is busy. */
>+ if (netif_running(dev))
>+ return -EBUSY;
>+
>+ return macsec_update_offload(macsec, offload);
>+}
>+
> static int macsec_changelink(struct net_device *dev, struct nlattr *tb[],
> struct nlattr *data[],
> struct netlink_ext_ack *extack)
>@@ -3831,6 +3851,12 @@ static int macsec_changelink(struct net_device *dev, struct nlattr *tb[],
> if (ret)
> goto cleanup;
>
>+ if (data[IFLA_MACSEC_OFFLOAD]) {
>+ ret = macsec_changelink_upd_offload(dev, data);
>+ if (ret)
>+ goto cleanup;
>+ }
>+
> /* If h/w offloading is available, propagate to the device */
> if (macsec_is_offloaded(macsec)) {
> const struct macsec_ops *ops;
>--
>2.21.3
>

\
 
 \ /
  Last update: 2022-12-07 16:36    [W:0.070 / U:1.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site