| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CO1PR18MB4666F17B36D718C7D3935A77A1909@CO1PR18MB4666.namprd18.prod.outlook.com>
Date: Wed, 5 Apr 2023 13:47:24 +0000
From: Subbaraya Sundeep Bhatta <sbhatta@...vell.com>
To: "edumazet@...gle.com" <edumazet@...gle.com>,
"ehakim@...dia.com" <ehakim@...dia.com>,
"davem@...emloft.net" <davem@...emloft.net>,
"kuba@...nel.org" <kuba@...nel.org>,
"pabeni@...hat.com" <pabeni@...hat.com>,
"edumazet@...gle.com" <edumazet@...gle.com>,
"sd@...asysnail.net" <sd@...asysnail.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Sunil Kovvuri Goutham <sgoutham@...vell.com>
Subject: RE: [EXT] Fwd: [PATCH net-next v3 1/4] vlan: Add MACsec offload
operations for VLAN interface
Hi,
>From: Emeel Hakim <mailto:ehakim@...dia.com>
>Date: Thu, Mar 30, 2023 at 7:57 PM
>Subject: [PATCH net-next v3 1/4] vlan: Add MACsec offload operations for
>VLAN interface
>To: <mailto:davem@...emloft.net>, <mailto:kuba@...nel.org>,
><mailto:pabeni@...hat.com>, <mailto:edumazet@...gle.com>,
><mailto:sd@...asysnail.net>
>Cc: <mailto:netdev@...r.kernel.org>, <mailto:leon@...nel.org>, Emeel
>Hakim <mailto:ehakim@...dia.com>
>
>
>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: Emeel Hakim <mailto:ehakim@...dia.com>
>---
> .../net/ethernet/mellanox/mlx5/core/en_main.c | 1 +
> net/8021q/vlan_dev.c | 153 ++++++++++++++++++
Do not mix generic vlan code changes and your driver changes in one patch.
> 2 files changed, 154 insertions(+)
>
>diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>index 6db1aff8778d..5ecef26e83c6 100644
>--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>@@ -5076,6 +5076,7 @@ static void mlx5e_build_nic_netdev(struct
>net_device *netdev)
>
> netdev->vlan_features |= NETIF_F_SG;
> netdev->vlan_features |= NETIF_F_HW_CSUM;
>+ netdev->vlan_features |= NETIF_F_HW_MACSEC;
> netdev->vlan_features |= NETIF_F_GRO;
> netdev->vlan_features |= NETIF_F_TSO;
> netdev->vlan_features |= NETIF_F_TSO6; diff --git
>a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index
>5920544e93e8..16efc1bfc345 100644
>--- a/net/8021q/vlan_dev.c
>+++ b/net/8021q/vlan_dev.c
>@@ -26,6 +26,7 @@
> #include <linux/ethtool.h>
> #include <linux/phy.h>
> #include <net/arp.h>
>+#include <net/macsec.h>
>
> #include "vlan.h"
> #include "vlanproc.h"
>@@ -572,6 +573,9 @@ static int vlan_dev_init(struct net_device *dev)
> NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC |
> NETIF_F_ALL_FCOE;
>
>+ if (real_dev->features & NETIF_F_HW_MACSEC)
>+ dev->hw_features |= NETIF_F_HW_MACSEC;
>+
> dev->features |= dev->hw_features | NETIF_F_LLTX;
> netif_inherit_tso_max(dev, real_dev);
> if (dev->features & NETIF_F_VLAN_FEATURES) @@ -803,6 +807,152 @@
>static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx,
> 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_add_txsa(struct macsec_context *ctx) {
>+ const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
>+
>+ if (!ops || !ops->mdo_add_txsa)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_upd_txsa)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_del_txsa)
>+ return -EOPNOTSUPP;
>+
>+ return ops->mdo_del_txsa(ctx);
>+}
>+
>+static int vlan_macsec_add_rxsa(struct macsec_context *ctx) {
>+ const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
>+
>+ if (!ops || !ops->mdo_add_rxsa)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_upd_rxsa)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_del_rxsa)
>+ return -EOPNOTSUPP;
>+
>+ return ops->mdo_del_rxsa(ctx);
>+}
>+
>+static int vlan_macsec_add_rxsc(struct macsec_context *ctx) {
>+ const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
>+
>+ if (!ops || !ops->mdo_add_rxsc)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_upd_rxsc)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_del_rxsc)
>+ return -EOPNOTSUPP;
>+
>+ return ops->mdo_del_rxsc(ctx);
>+}
>+
>+static int vlan_macsec_add_secy(struct macsec_context *ctx) {
>+ const struct macsec_ops *ops = vlan_get_macsec_ops(ctx);
>+
>+ if (!ops || !ops->mdo_add_secy)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_upd_secy)
>+ return -EOPNOTSUPP;
>+
>+ return 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 || !ops->mdo_del_secy)
>+ return -EOPNOTSUPP;
>+
>+ return ops->mdo_del_secy(ctx);
>+}
>+
>+#undef _BUILD_VLAN_MACSEC_MDO
>+
I guess you missed to delete this.
>+static const struct macsec_ops macsec_offload_ops = {
>+ .mdo_add_txsa = vlan_macsec_add_txsa,
>+ .mdo_upd_txsa = vlan_macsec_upd_txsa,
>+ .mdo_del_txsa = vlan_macsec_del_txsa,
>+ .mdo_add_rxsc = vlan_macsec_add_rxsc,
>+ .mdo_upd_rxsc = vlan_macsec_upd_rxsc,
>+ .mdo_del_rxsc = vlan_macsec_del_rxsc,
>+ .mdo_add_rxsa = vlan_macsec_add_rxsa,
>+ .mdo_upd_rxsa = vlan_macsec_upd_rxsa,
>+ .mdo_del_rxsa = vlan_macsec_del_rxsa,
>+ .mdo_add_secy = vlan_macsec_add_secy,
>+ .mdo_upd_secy = vlan_macsec_upd_secy,
>+ .mdo_del_secy = vlan_macsec_del_secy, };
>+
Please add mdo_open, stop and stats too. Those are required for other macsec offload drivers.
Thanks.
Sundeep
>+#endif
>+
> static const struct ethtool_ops vlan_ethtool_ops = {
> .get_link_ksettings = vlan_ethtool_get_link_ksettings,
> .get_drvinfo = vlan_ethtool_get_drvinfo, @@ -869,6 +1019,9 @@
>void vlan_setup(struct net_device *dev)
> dev->priv_destructor = vlan_dev_free;
> dev->ethtool_ops = &vlan_ethtool_ops;
>
>+#if IS_ENABLED(CONFIG_MACSEC)
>+ dev->macsec_ops = &macsec_offload_ops; #endif
> dev->min_mtu = 0;
> dev->max_mtu = ETH_MAX_MTU;
>
>--
>2.21.3
Powered by blists - more mailing lists