From: Saeed Mahameed <saeed@kernel•org>
To: "David S. Miller" <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>
Cc: netdev@vger•kernel.org,
"Cc : Steffen Klassert" <steffen.klassert@secunet•com>,
Huy Nguyen <huyn@nvidia•com>, Raed Salem <raeds@nvidia•com>
Subject: [PATCH net 2/3] net/xfrm: Add inner_ipproto into sec_path
Date: Wed, 14 Apr 2021 16:25:39 -0700 [thread overview]
Message-ID: <20210414232540.138232-3-saeed@kernel.org> (raw)
In-Reply-To: <20210414232540.138232-1-saeed@kernel.org>
From: Huy Nguyen <huyn@nvidia•com>
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.
For example, ConnectX6-DX IPsec device needs the plaintext's
IP protocol to support partial checksum offload on
VXLAN/GENEVE packet over IPsec transport mode tunnel.
Signed-off-by: Raed Salem <raeds@nvidia•com>
Signed-off-by: Huy Nguyen <huyn@nvidia•com>
Cc: Steffen Klassert <steffen.klassert@secunet•com>
---
include/net/xfrm.h | 1 +
net/xfrm/xfrm_output.c | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index c58a6d4eb610..e535700431fb 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1032,6 +1032,7 @@ struct sec_path {
struct xfrm_state *xvec[XFRM_MAX_DEPTH];
struct xfrm_offload ovec[XFRM_MAX_OFFLOAD_DEPTH];
+ u8 inner_ipproto;
};
struct sec_path *secpath_set(struct sk_buff *skb);
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index e4cb0ff4dcf4..da412928093b 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -565,6 +565,36 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb
return 0;
}
+/* Save inner ip protocol for vendor offload usage */
+static void get_inner_ipproto(struct sk_buff *skb, struct sec_path *sp)
+{
+ const struct ethhdr *eth;
+
+ if (!skb->inner_protocol)
+ return;
+
+ if (skb->inner_protocol_type == ENCAP_TYPE_IPPROTO) {
+ sp->inner_ipproto = skb->inner_protocol;
+ return;
+ }
+
+ if (skb->inner_protocol_type != ENCAP_TYPE_ETHER)
+ return;
+
+ eth = (struct ethhdr *)skb_inner_mac_header(skb);
+
+ switch (eth->h_proto) {
+ case ntohs(ETH_P_IPV6):
+ sp->inner_ipproto = inner_ipv6_hdr(skb)->nexthdr;
+ break;
+ case ntohs(ETH_P_IP):
+ sp->inner_ipproto = inner_ip_hdr(skb)->protocol;
+ break;
+ default:
+ return;
+ }
+}
+
int xfrm_output(struct sock *sk, struct sk_buff *skb)
{
struct net *net = dev_net(skb_dst(skb)->dev);
@@ -594,8 +624,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
kfree_skb(skb);
return -ENOMEM;
}
- skb->encapsulation = 1;
+ sp->inner_ipproto = 0;
+ if (skb->encapsulation)
+ get_inner_ipproto(skb, sp);
+
+ skb->encapsulation = 1;
sp->olen++;
sp->xvec[sp->len++] = x;
xfrm_state_hold(x);
--
2.30.2
next prev parent reply other threads:[~2021-04-14 23:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 23:25 [PATCH net 0/3] Fix ipsec offlaods with vxlan tunnel Saeed Mahameed
2021-04-14 23:25 ` [PATCH net 1/3] net/mlx5: Optimize mlx5e_feature_checks for non IPsec packet Saeed Mahameed
2021-04-14 23:25 ` Saeed Mahameed [this message]
2021-04-15 7:47 ` [PATCH net 2/3] net/xfrm: Add inner_ipproto into sec_path Steffen Klassert
2021-04-15 17:00 ` Jakub Kicinski
2021-04-29 1:50 ` Huy Nguyen
2021-04-14 23:25 ` [PATCH net 3/3] net/mlx5: Fix checksum issue of VXLAN and IPsec crypto offload Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414232540.138232-3-saeed@kernel.org \
--to=saeed@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=huyn@nvidia$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=raeds@nvidia$(echo .)com \
--cc=steffen.klassert@secunet$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox