macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads
PATCH 1/4 macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads
commit 475747a19316b08e856c666a20503e73d7ed67ed upstream.
Omit rx_use_md_dst comment in upstream commit since macsec_ops is not documented.
Cannot know whether a Rx skb missing md_dst is intended for MACsec or not without knowing whether the device is able to update this field during an offload. Assume that an offload to a MACsec device cannot support updating md_dst by default. Capable devices can advertise that they do indicate that an skb is related to a MACsec offloaded packet using the md_dst.
--- include/net/macsec.h | 1 + 1 file changed, 1 insertion(+)
include/net/macsec.h +1 -0
@@ -303,6 +303,7 @@ struct macsec_ops {int (*mdo_get_tx_sa_stats)(struct macsec_context *ctx);int (*mdo_get_rx_sc_stats)(struct macsec_context *ctx);int (*mdo_get_rx_sa_stats)(struct macsec_context *ctx); +bool rx_uses_md_dst; };void macsec_pn_wrapped (struct macsec_secy *secy,struct macsec_tx_sa *tx_sa);
Signature · 1 line
2.42.0
PATCH 2/4 ethernet: Add helper for assigning packet type when dest address does not match device address
commit 6e159fd653d7ebf6290358e0330a0cb8a75cf73b upstream.
Enable reuse of logic in eth_type_trans for determining packet type.
--- include/linux/etherdevice.h | 25 +++++++++++++++++++++++++ net/ethernet/eth.c | 12 +----------- 2 files changed, 26 insertions(+), 11 deletions(-)
include/linux/etherdevice.h +25 -0
@@ -607,6 +607,31 @@ static inline void eth_hw_addr_gen(struct net_device *dev, const u8 *base_addr,eth_hw_addr_set (dev, addr); } +/** +* eth_skb_pkt_type - Assign packet type if destination address does not match +* @skb: Assigned a packet type if address does not match @dev address +* @dev: Network device used to compare packet address against +* +* If the destination MAC address of the packet does not match the network +* device address, assign an appropriate packet type. +*/ +static inline void eth_skb_pkt_type (struct sk_buff *skb, +const struct net_device *dev) +{ +const struct ethhdr *eth =eth_hdr (skb); + +if (unlikely (!ether_addr_equal_64bits (eth->h_dest, dev->dev_addr))) { +if (unlikely (is_multicast_ether_addr_64bits (eth->h_dest))) { +if (ether_addr_equal_64bits (eth->h_dest, dev->broadcast)) + skb->pkt_type =PACKET_BROADCAST ; +else + skb->pkt_type =PACKET_MULTICAST ; + }else { + skb->pkt_type =PACKET_OTHERHOST ; + } + } +} +/** * eth_skb_pad - Pad buffer to mininum number of octets for Ethernet frame * @skb: Buffer to pad
net/ethernet/eth.c +1 -11
@@ -164,17 +164,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) eth = (struct ethhdr *)skb->data;skb_pull_inline (skb,ETH_HLEN ); -if (unlikely (!ether_addr_equal_64bits (eth->h_dest, - dev->dev_addr))) { -if (unlikely (is_multicast_ether_addr_64bits (eth->h_dest))) { -if (ether_addr_equal_64bits (eth->h_dest, dev->broadcast)) - skb->pkt_type =PACKET_BROADCAST ; -else - skb->pkt_type =PACKET_MULTICAST ; - }else { - skb->pkt_type =PACKET_OTHERHOST ; - } - } +eth_skb_pkt_type (skb, dev);/* * Some variants of DSA tagging don't have an ethertype field
Signature · 1 line
2.42.0
PATCH 3/4 macsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst
In reply to Rahul Rameshbabucommit 642c984dd0e37dbaec9f87bd1211e5fac1f142bf upstream.
Can now correctly identify where the packets should be delivered by using md_dst or its absence on devices that provide it.
This detection is not possible without device drivers that update md_dst. A fallback pattern should be used for supporting such device drivers. This fallback mode causes multicast messages to be cloned to both the non-macsec and macsec ports, independent of whether the multicast message received was encrypted over MACsec or not. Other non-macsec traffic may also fail to be handled correctly for devices in promiscuous mode.
--- drivers/net/macsec.c | 46 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-)
drivers/net/macsec.c +36 -10
@@ -996,10 +996,12 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)struct metadata_dst *md_dst;struct macsec_rxh_data *rxd;struct macsec_dev *macsec; +bool is_macsec_md_dst;rcu_read_lock (); rxd =macsec_data_rcu (skb->dev); md_dst =skb_metadata_dst (skb); + is_macsec_md_dst = md_dst && md_dst->type ==METADATA_MACSEC ;list_for_each_entry_rcu (macsec, &rxd->secys, secys) {struct sk_buff *nskb;
@@ -1010,14 +1012,42 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)* the SecTAG, so we have to deduce which port to deliver to. */ if (macsec_is_offloaded (macsec) &&netif_running (ndev)) { -struct macsec_rx_sc *rx_sc =NULL ; +const struct macsec_ops *ops; -if (md_dst && md_dst->type ==METADATA_MACSEC ) - rx_sc =find_rx_sc (&macsec->secy, md_dst->u.macsec_info.sci); + ops =macsec_get_ops (macsec,NULL ); -if (md_dst && md_dst->type ==METADATA_MACSEC && !rx_sc) +if (ops->rx_uses_md_dst && !is_macsec_md_dst)continue ; +if (is_macsec_md_dst) { +struct macsec_rx_sc *rx_sc; + +/* All drivers that implement MACsec offload +* support using skb metadata destinations must +* indicate that they do so. +*/ +DEBUG_NET_WARN_ON_ONCE (!ops->rx_uses_md_dst); + rx_sc =find_rx_sc (&macsec->secy, + md_dst->u.macsec_info.sci); +if (!rx_sc) +continue ; +/* device indicated macsec offload occurred */ + skb->dev = ndev; + skb->pkt_type =PACKET_HOST ; +eth_skb_pkt_type (skb, ndev); + ret =RX_HANDLER_ANOTHER ; + goto out; + } + +/* This datapath is insecure because it is unable to +* enforce isolation of broadcast/multicast traffic and +* unicast traffic with promiscuous mode on the macsec +* netdev. Since the core stack has no mechanism to +* check that the hardware did indeed receive MACsec +* traffic, it is possible that the response handling +* done by the MACsec port was to a plaintext packet. +* This violates the MACsec protocol standard. +*/ if (ether_addr_equal_64bits (hdr->h_dest, ndev->dev_addr)) {/* exact match, divert skb to this port */
@@ -1033,14 +1063,10 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)break ; nskb->dev = ndev; -if (ether_addr_equal_64bits (hdr->h_dest, - ndev->broadcast)) - nskb->pkt_type =PACKET_BROADCAST ; -else - nskb->pkt_type =PACKET_MULTICAST ; +eth_skb_pkt_type (nskb, ndev);__netif_rx (nskb); - }else if (rx_sc || ndev->flags &IFF_PROMISC ) { + }else if (ndev->flags &IFF_PROMISC ) { skb->dev = ndev; skb->pkt_type =PACKET_HOST ; ret =RX_HANDLER_ANOTHER ;
Signature · 1 line
2.42.0
PATCH 4/4 net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec
In reply to Rahul Rameshbabucommit 39d26a8f2efcb8b5665fe7d54a7dba306a8f1dff upstream.
mlx5 Rx flow steering and CQE handling enable the driver to be able to update an skb's md_dst attribute as MACsec when MACsec traffic arrives when a device is configured for offloading. Advertise this to the core stack to take advantage of this capability.
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c +1 -0
@@ -1640,6 +1640,7 @@ static const struct macsec_ops macsec_offload_ops = { .mdo_add_secy = mlx5e_macsec_add_secy, .mdo_upd_secy = mlx5e_macsec_upd_secy, .mdo_del_secy = mlx5e_macsec_del_secy, + .rx_uses_md_dst = true, };bool mlx5e_macsec_handle_tx_skb (struct mlx5e_macsec *macsec,struct sk_buff *skb)
Signature · 1 line
2.42.0