diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index c3c2c5720c6f..d091de1a5992 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -5132,6 +5132,23 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv,
return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
}
+/* The L4 protocol right after the fixed IP header, which the PSP Tx path
+ * requires, is one the device can complete the checksum of
+ */
+static bool mlx5e_psp_l4_csum_ok(const struct sk_buff *skb)
+{
+ u8 proto;
+
+ if (skb->protocol == htons(ETH_P_IP))
+ proto = ip_hdr(skb)->protocol;
+ else if (skb->protocol == htons(ETH_P_IPV6))
+ proto = ipv6_hdr(skb)->nexthdr;
+ else
+ return false;
+
+ return proto == IPPROTO_TCP || proto == IPPROTO_UDP;
+}
+
netdev_features_t mlx5e_features_check(struct sk_buff *skb,
struct net_device *netdev,
netdev_features_t features)@@ -5140,6 +5157,22 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb,
features = vlan_features_check(skb, features);
+ /* The PSP tx path fixes up the TCP checksum of a GSO skb for the
+ * device, which is only valid for TCP, and the device only completes
+ * a TCP or UDP checksum behind the PSP header. Have the stack segment
+ * and checksum other skbs.
+ */
+ if ((skb_is_gso(skb) || skb->ip_summed == CHECKSUM_PARTIAL) &&
+ mlx5e_psp_is_offload(skb, netdev)) {
+ if (skb_is_gso(skb) &&
+ !(skb_shinfo(skb)->gso_type &
+ (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)))
+ features &= ~NETIF_F_GSO_MASK;
+ if (skb->ip_summed == CHECKSUM_PARTIAL &&
+ !mlx5e_psp_l4_csum_ok(skb))
+ features &= ~NETIF_F_CSUM_MASK;
+ }
+
/* Validate if the tunneled packet is being offloaded by HW */
if (skb->encapsulation &&
(features & NETIF_F_CSUM_MASK || features & NETIF_F_GSO_MASK))diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c
index e09f6fec948d..1eb1617aaf2b 100644
--- a/net/psp/psp_main.c
+++ b/net/psp/psp_main.c
@@ -189,7 +189,8 @@ unsigned int psp_key_size(u32 version)
EXPORT_SYMBOL(psp_key_size);
static void psp_write_headers(struct net *net, struct sk_buff *skb, __be32 spi,
- u8 ver, unsigned int udp_len, __be16 sport)
+ u8 ver, u8 nexthdr, unsigned int udp_len,
+ __be16 sport)
{
struct udphdr *uh = udp_hdr(skb);
struct psphdr *psph = (struct psphdr *)(uh + 1);@@ -236,7 +237,7 @@ static void psp_write_headers(struct net *net, struct sk_buff *skb, __be32 spi,
uh->check = 0;
udp_set_len(uh, udp_len);
- psph->nexthdr = IPPROTO_TCP;
+ psph->nexthdr = nexthdr;
psph->hdrlen = PSP_HDRLEN_NOOPT;
psph->crypt_offset = 0;
psph->verfl = FIELD_PREP(PSPHDR_VERFL_VERSION, ver) |
@@ -245,8 +246,36 @@ static void psp_write_headers(struct net *net, struct sk_buff *skb, __be32 spi,
memset(&psph->iv, 0, sizeof(psph->iv));
}
-/* Encapsulate a TCP packet with PSP by adding the UDP+PSP headers and filling
- * them in.
+/* udp+psp goes in at the transport header, the protocol of the fixed ip
+ * header becomes udp, and the psp next header takes the protocol it had: the
+ * transport header must directly follow the fixed header. it doesn't with
+ * ipv6 extension headers, whose last one holds the l4 protocol. for ipv6,
+ * check the next header too, not only the network header length: the seg6,
+ * rpl and ioam6 lwtunnels point the transport header at the extension header
+ * they insert. a packet already encapsulated for a tunnel has its inner
+ * headers set up for the tunnel, and an ipv4 fragment (e.g. refragmented
+ * after tc encap) has no l4 header, or not all of it.
+ */
+static bool psp_dev_encap_ok(const struct sk_buff *skb)
+{
+ u32 network_len = skb_network_header_len(skb);
+
+ if (skb->encapsulation)
+ return false;
+ if (skb->protocol == htons(ETH_P_IP))
+ return network_len == ip_hdrlen(skb) &&
+ !ip_is_fragment(ip_hdr(skb));
+ if (skb->protocol == htons(ETH_P_IPV6))
+ return !ipv6_ext_hdr(ipv6_hdr(skb)->nexthdr) &&
+ network_len == sizeof(struct ipv6hdr);
+ return false;
+}
+
+/* Encapsulate a packet with PSP by adding the UDP+PSP headers and filling
+ * them in. The PSP next header is taken from the IP header: packets with
+ * IPv6 extension headers, or whose transport header isn't right after the IP
+ * header, are refused, as are IPv4 fragments and packets already
+ * encapsulated for a tunnel.
*/
bool psp_dev_encapsulate(struct net *net, struct sk_buff *skb, __be32 spi,
u8 ver, __be16 sport)@@ -254,11 +283,16 @@ bool psp_dev_encapsulate(struct net *net, struct sk_buff *skb, __be32 spi,
u32 network_len = skb_network_header_len(skb);
u32 ethr_len = skb_mac_header_len(skb);
u32 bufflen = ethr_len + network_len;
+ u8 nexthdr;
- if (skb->protocol != htons(ETH_P_IP) &&
- skb->protocol != htons(ETH_P_IPV6))
+ if (!psp_dev_encap_ok(skb))
return false;
+ if (skb->protocol == htons(ETH_P_IP))
+ nexthdr = ip_hdr(skb)->protocol;
+ else
+ nexthdr = ipv6_hdr(skb)->nexthdr;
+
if (skb_cow_head(skb, PSP_ENCAP_HLEN))
return false;
@@ -279,11 +313,11 @@ bool psp_dev_encapsulate(struct net *net, struct sk_buff *skb, __be32 spi,
be16_add_cpu(&ipv6_hdr(skb)->payload_len, PSP_ENCAP_HLEN);
}
- skb_set_inner_ipproto(skb, IPPROTO_TCP);
+ skb_set_inner_ipproto(skb, nexthdr);
skb_set_inner_transport_header(skb, skb_transport_offset(skb) +
PSP_ENCAP_HLEN);
skb->encapsulation = 1;
- psp_write_headers(net, skb, spi, ver,
+ psp_write_headers(net, skb, spi, ver, nexthdr,
skb->len - skb_transport_offset(skb), sport);
return true;
--
2.53.0-Meta