net: macsec: add support for specifying offload upon link creation
Subsystems (3)
PATCH 1/1 net: macsec: add support for specifying offload upon link creation
From: Mark Starovoytov <[email protected]>
This patch adds new netlink attribute to allow a user to (optionally) specify the desired offload mode immediately upon MACSec link creation.
Separate iproute patch will be required to support this from user space.
Signed-off-by Mark Starovoytov <[email protected]>
Signed-off-by Igor Russkikh <[email protected]>
--- drivers/net/macsec.c | 31 ++++++++++++++++++++++++++++-- include/uapi/linux/if_link.h | 1 + tools/include/uapi/linux/if_link.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-)
drivers/net/macsec.c +29 -2
@@ -1445,6 +1445,11 @@ static struct net_device *get_dev_from_nl(struct net *net,return dev; } +static enum macsec_offload nla_get_offload (const struct nlattr *nla) +{ +return (__force enum macsec_offload )nla_get_u8 (nla); +} +static sci_t nla_get_sci (const struct nlattr *nla) {return (__force sci_t )nla_get_u64 (nla);
@@ -3861,8 +3866,16 @@ static int macsec_newlink(struct net *net, struct net_device *dev, macsec->real_dev = real_dev; -/* MACsec offloading is off by default */ - macsec->offload =MACSEC_OFFLOAD_OFF ; +if (data && data[IFLA_MACSEC_OFFLOAD ]) + macsec->offload =nla_get_offload (data[IFLA_MACSEC_OFFLOAD ]); +else +/* MACsec offloading is off by default */ + macsec->offload =MACSEC_OFFLOAD_OFF ; + +/* Check if the offloading mode is supported by the underlying layers */ +if (macsec->offload !=MACSEC_OFFLOAD_OFF && + !macsec_check_offload (macsec->offload, macsec)) +return -EOPNOTSUPP ;if (data && data[IFLA_MACSEC_ICV_LEN ]) icv_len =nla_get_u8 (data[IFLA_MACSEC_ICV_LEN ]);
@@ -3905,6 +3918,20 @@ static int macsec_newlink(struct net *net, struct net_device *dev, goto del_dev; } +/* If h/w offloading is available, propagate to the device */ +if (macsec_is_offloaded (macsec)) { +const struct macsec_ops *ops; +struct macsec_context ctx; + + ops =macsec_get_ops (macsec, &ctx); +if (ops) { + ctx.secy = &macsec->secy; + err =macsec_offload (ops->mdo_add_secy, &ctx); +if (err) + goto del_dev; + } + } + err =register_macsec_dev (real_dev, dev);if (err <0 ) goto del_dev;
include/uapi/linux/if_link.h +1 -0
@@ -463,6 +463,7 @@ enum {IFLA_MACSEC_REPLAY_PROTECT ,IFLA_MACSEC_VALIDATION ,IFLA_MACSEC_PAD , +IFLA_MACSEC_OFFLOAD , __IFLA_MACSEC_MAX, };
tools/include/uapi/linux/if_link.h +1 -0
@@ -463,6 +463,7 @@ enum {IFLA_MACSEC_REPLAY_PROTECT ,IFLA_MACSEC_VALIDATION ,IFLA_MACSEC_PAD , +IFLA_MACSEC_OFFLOAD , __IFLA_MACSEC_MAX, };
Signature · 1 line
2.17.1
From: Igor Russkikh <[email protected]>
Date: Wed, 25 Mar 2020 16:01:34 +0300
Quoted 9 lines
From: Mark Starovoytov <[email protected]>
This patch adds new netlink attribute to allow a user to (optionally) specify the desired offload mode immediately upon MACSec link creation.
Separate iproute patch will be required to support this from user space.
Signed-off-by Mark Starovoytov <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Applied to net-next, thank you.