Commit abff3e5e authored by Emeel Hakim's avatar Emeel Hakim Committed by David S. Miller

vlan: Add MACsec offload operations for VLAN interface

Add support for MACsec offload operations for VLAN driver
to allow offloading MACsec when VLAN's real device supports
Macsec offload by forwarding the offload request to it.
Signed-off-by: default avatarEmeel Hakim <ehakim@nvidia.com>
Reviewed-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2598dbd
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <net/arp.h> #include <net/arp.h>
#include <net/macsec.h>
#include "vlan.h" #include "vlan.h"
#include "vlanproc.h" #include "vlanproc.h"
...@@ -572,6 +573,9 @@ static int vlan_dev_init(struct net_device *dev) ...@@ -572,6 +573,9 @@ static int vlan_dev_init(struct net_device *dev)
NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC | NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
NETIF_F_ALL_FCOE; NETIF_F_ALL_FCOE;
if (real_dev->vlan_features & NETIF_F_HW_MACSEC)
dev->hw_features |= NETIF_F_HW_MACSEC;
dev->features |= dev->hw_features | NETIF_F_LLTX; dev->features |= dev->hw_features | NETIF_F_LLTX;
netif_inherit_tso_max(dev, real_dev); netif_inherit_tso_max(dev, real_dev);
if (dev->features & NETIF_F_VLAN_FEATURES) if (dev->features & NETIF_F_VLAN_FEATURES)
...@@ -803,6 +807,241 @@ static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx, ...@@ -803,6 +807,241 @@ static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx,
return 0; return 0;
} }
#if IS_ENABLED(CONFIG_MACSEC)
static const struct macsec_ops *vlan_get_macsec_ops(const struct macsec_context *ctx)
{
return vlan_dev_priv(ctx->netdev)->real_dev->macsec_ops;
}
static int vlan_macsec_offload(int (* const func)(struct macsec_context *),
struct macsec_context *ctx)
{
if (unlikely(!func))
return 0;
return (*func)(ctx);
}
static int vlan_macsec_dev_open(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_dev_open, ctx);
}
static int vlan_macsec_dev_stop(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_dev_stop, ctx);
}
static int vlan_macsec_add_secy(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_add_secy, ctx);
}
static int vlan_macsec_upd_secy(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_upd_secy, ctx);
}
static int vlan_macsec_del_secy(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_del_secy, ctx);
}
static int vlan_macsec_add_rxsc(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_add_rxsc, ctx);
}
static int vlan_macsec_upd_rxsc(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_upd_rxsc, ctx);
}
static int vlan_macsec_del_rxsc(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_del_rxsc, ctx);
}
static int vlan_macsec_add_rxsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_add_rxsa, ctx);
}
static int vlan_macsec_upd_rxsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_upd_rxsa, ctx);
}
static int vlan_macsec_del_rxsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_del_rxsa, ctx);
}
static int vlan_macsec_add_txsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_add_txsa, ctx);
}
static int vlan_macsec_upd_txsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_upd_txsa, ctx);
}
static int vlan_macsec_del_txsa(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_del_txsa, ctx);
}
static int vlan_macsec_get_dev_stats(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_get_dev_stats, ctx);
}
static int vlan_macsec_get_tx_sc_stats(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_get_tx_sc_stats, ctx);
}
static int vlan_macsec_get_tx_sa_stats(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_get_tx_sa_stats, ctx);
}
static int vlan_macsec_get_rx_sc_stats(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_get_rx_sc_stats, ctx);
}
static int vlan_macsec_get_rx_sa_stats(struct macsec_context *ctx)
{
const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
if (!ops)
return -EOPNOTSUPP;
return vlan_macsec_offload(ops->mdo_get_rx_sa_stats, ctx);
}
static const struct macsec_ops macsec_offload_ops = {
/* Device wide */
.mdo_dev_open = vlan_macsec_dev_open,
.mdo_dev_stop = vlan_macsec_dev_stop,
/* SecY */
.mdo_add_secy = vlan_macsec_add_secy,
.mdo_upd_secy = vlan_macsec_upd_secy,
.mdo_del_secy = vlan_macsec_del_secy,
/* Security channels */
.mdo_add_rxsc = vlan_macsec_add_rxsc,
.mdo_upd_rxsc = vlan_macsec_upd_rxsc,
.mdo_del_rxsc = vlan_macsec_del_rxsc,
/* Security associations */
.mdo_add_rxsa = vlan_macsec_add_rxsa,
.mdo_upd_rxsa = vlan_macsec_upd_rxsa,
.mdo_del_rxsa = vlan_macsec_del_rxsa,
.mdo_add_txsa = vlan_macsec_add_txsa,
.mdo_upd_txsa = vlan_macsec_upd_txsa,
.mdo_del_txsa = vlan_macsec_del_txsa,
/* Statistics */
.mdo_get_dev_stats = vlan_macsec_get_dev_stats,
.mdo_get_tx_sc_stats = vlan_macsec_get_tx_sc_stats,
.mdo_get_tx_sa_stats = vlan_macsec_get_tx_sa_stats,
.mdo_get_rx_sc_stats = vlan_macsec_get_rx_sc_stats,
.mdo_get_rx_sa_stats = vlan_macsec_get_rx_sa_stats,
};
#endif
static const struct ethtool_ops vlan_ethtool_ops = { static const struct ethtool_ops vlan_ethtool_ops = {
.get_link_ksettings = vlan_ethtool_get_link_ksettings, .get_link_ksettings = vlan_ethtool_get_link_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo, .get_drvinfo = vlan_ethtool_get_drvinfo,
...@@ -869,6 +1108,9 @@ void vlan_setup(struct net_device *dev) ...@@ -869,6 +1108,9 @@ void vlan_setup(struct net_device *dev)
dev->priv_destructor = vlan_dev_free; dev->priv_destructor = vlan_dev_free;
dev->ethtool_ops = &vlan_ethtool_ops; dev->ethtool_ops = &vlan_ethtool_ops;
#if IS_ENABLED(CONFIG_MACSEC)
dev->macsec_ops = &macsec_offload_ops;
#endif
dev->min_mtu = 0; dev->min_mtu = 0;
dev->max_mtu = ETH_MAX_MTU; dev->max_mtu = ETH_MAX_MTU;
......
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