Skip to contentSkip to conversation

net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path

PATCH Applied Raed Salem 3 participants 5 messages Jan 3, 2022 – Jan 10, 2022

Subsystems (3)
lore
Share & tools
lore

Raed Salem

author
#0 lore raw

PATCH v2 1/1 net/xfrm: IPsec tunnel mode fix inner_ipproto setting in sec_path

The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.

Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.

Fixes fa4535238fb5 ("net/xfrm: Add inner_ipproto into sec_path")

---
v2 changes:
Remove Change-Id from commit message

 net/xfrm/xfrm_output.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
net/xfrm/xfrm_output.c +25 -5
index 229544b..4dc4a7b 100644
@@ -647,10 +647,12 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb
  * This requires hardware to know the inner packet type to calculate
  * the inner header checksum. Save inner ip protocol here to avoid
  * traversing the packet in the vendor's xmit code.
- * If the encap type is IPIP, just save skb->inner_ipproto. Otherwise,
- * get the ip protocol from the IP header.
+ * For IPsec tunnel mode save the ip protocol from the IP header of the
+ * plain text packet. Otherwise If the encap type is IPIP, just save
+ * skb->inner_ipproto in any other case get the ip protocol from the IP
+ * header.
  */
-static void xfrm_get_inner_ipproto(struct sk_buff *skb)
+static void xfrm_get_inner_ipproto(struct sk_buff *skb, struct xfrm_state *x)
 {
 	struct xfrm_offload *xo = xfrm_offload(skb);
 	const struct ethhdr *eth;
@@ -658,6 +660,25 @@ static void xfrm_get_inner_ipproto(struct sk_buff *skb)
 	if (!xo)
 		return;
 
+	if (x->outer_mode.encap == XFRM_MODE_TUNNEL) {
+		switch (x->outer_mode.family) {
+		case AF_INET:
+			xo->inner_ipproto = ip_hdr(skb)->protocol;
+			break;
+		case AF_INET6:
+			xo->inner_ipproto = ipv6_hdr(skb)->nexthdr;
+			break;
+		default:
+			break;
+		}
+
+		return;
+	}
+
+	/* non-Tunnel Mode */
+	if (!skb->encapsulation)
+		return;
+
 	if (skb->inner_protocol_type == ENCAP_TYPE_IPPROTO) {
 		xo->inner_ipproto = skb->inner_ipproto;
 		return;
@@ -712,8 +733,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
 		sp->xvec[sp->len++] = x;
 		xfrm_state_hold(x);
 
-		if (skb->encapsulation)
-			xfrm_get_inner_ipproto(skb);
+		xfrm_get_inner_ipproto(skb, x);
 		skb->encapsulation = 1;
 
 		if (skb_is_gso(skb)) {
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw
Quoted 11 lines · Raed Salem

The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.

Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.

Fixes fa4535238fb5 ("net/xfrm: Add inner_ipproto into sec_path")

Applied, thanks Raed!

#2 lore raw
Quoted 7 lines · Steffen Klassert
Quoted 6 lines · Raed Salem

The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.

Quoted 7 lines
Quoted 5 lines

Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.

Fixes fa4535238fb5 ("net/xfrm: Add inner_ipproto into sec_path")

Applied, thanks Raed!

hmm, there are two mlx5 patches that depend on this patch, I thought Raed was planning to send them along with this.

Steffen, is it ok if I submit those two patches to you and so you would send them all at once in your next net PR ?

Thanks,
Saeed.

maintainer
#3 lore raw
Quoted 14 lines · Saeed Mahameed
Quoted 13 lines · Steffen Klassert
Quoted 11 lines · Raed Salem

The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.

Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.

Fixes fa4535238fb5 ("net/xfrm: Add inner_ipproto into sec_path")
Quoted 7 lines
Quoted 1 line

Applied, thanks Raed!

hmm, there are two mlx5 patches that depend on this patch, I thought Raed was planning to send them along with this.

Steffen, is it ok if I submit those two patches to you and so you would send them all at once in your next net PR ?

The pull request with that patch included is already merged into the net tree. So if you pull the net tree, you can apply the mlx5 patches yourself. But if you prefer, I can take them too.

#4 lore raw
Quoted 20 lines · Steffen Klassert
Quoted 19 lines · Saeed Mahameed
Quoted 7 lines · Steffen Klassert
Quoted 6 lines · Raed Salem

The inner_ipproto saves the inner IP protocol of the plain text packet. This allows vendor's IPsec feature making offload decision at skb's features_check and configuring hardware at ndo_start_xmit, current code implenetation did not handle the case where IPsec is used in tunnel mode.

Quoted 7 lines
Quoted 5 lines

Fix by handling the case when IPsec is used in tunnel mode by reading the protocol of the plain text packet IP protocol.

Fixes fa4535238fb5 ("net/xfrm: Add inner_ipproto into sec_path")

Applied, thanks Raed!

hmm, there are two mlx5 patches that depend on this patch, I thought Raed was planning to send them along with this.

Quoted 7 lines
Quoted 2 lines

Steffen, is it ok if I submit those two patches to you and so you would send them all at once in your next net PR ?

The pull request with that patch included is already merged into the net tree. So if you pull the net tree, you can apply the mlx5 patches yourself. But if you prefer, I can take them too.

Didn't know they are already in net, i will post them to net soon, thanks !