Commit 791bb3fc authored by Mark Starovoytov's avatar Mark Starovoytov Committed by David S. Miller

net: macsec: add support for specifying offload upon link creation

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: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0b59897
...@@ -1469,6 +1469,11 @@ static struct net_device *get_dev_from_nl(struct net *net, ...@@ -1469,6 +1469,11 @@ static struct net_device *get_dev_from_nl(struct net *net,
return dev; 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) static sci_t nla_get_sci(const struct nlattr *nla)
{ {
return (__force sci_t)nla_get_u64(nla); return (__force sci_t)nla_get_u64(nla);
...@@ -4012,9 +4017,17 @@ static int macsec_newlink(struct net *net, struct net_device *dev, ...@@ -4012,9 +4017,17 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
macsec->real_dev = real_dev; macsec->real_dev = real_dev;
if (data && data[IFLA_MACSEC_OFFLOAD])
macsec->offload = nla_get_offload(data[IFLA_MACSEC_OFFLOAD]);
else
/* MACsec offloading is off by default */ /* MACsec offloading is off by default */
macsec->offload = MACSEC_OFFLOAD_OFF; 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]) if (data && data[IFLA_MACSEC_ICV_LEN])
icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]); icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]);
dev->mtu = real_dev->mtu - icv_len - macsec_extra_len(true); dev->mtu = real_dev->mtu - icv_len - macsec_extra_len(true);
...@@ -4056,6 +4069,20 @@ static int macsec_newlink(struct net *net, struct net_device *dev, ...@@ -4056,6 +4069,20 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
goto del_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); err = register_macsec_dev(real_dev, dev);
if (err < 0) if (err < 0)
goto del_dev; goto del_dev;
......
...@@ -463,6 +463,7 @@ enum { ...@@ -463,6 +463,7 @@ enum {
IFLA_MACSEC_REPLAY_PROTECT, IFLA_MACSEC_REPLAY_PROTECT,
IFLA_MACSEC_VALIDATION, IFLA_MACSEC_VALIDATION,
IFLA_MACSEC_PAD, IFLA_MACSEC_PAD,
IFLA_MACSEC_OFFLOAD,
__IFLA_MACSEC_MAX, __IFLA_MACSEC_MAX,
}; };
......
...@@ -463,6 +463,7 @@ enum { ...@@ -463,6 +463,7 @@ enum {
IFLA_MACSEC_REPLAY_PROTECT, IFLA_MACSEC_REPLAY_PROTECT,
IFLA_MACSEC_VALIDATION, IFLA_MACSEC_VALIDATION,
IFLA_MACSEC_PAD, IFLA_MACSEC_PAD,
IFLA_MACSEC_OFFLOAD,
__IFLA_MACSEC_MAX, __IFLA_MACSEC_MAX,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment