From: Xin Long <lucien.xin@gmail.com>
To: netdev@vger.kernel.org
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>,
Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Sabrina Dubroca <sd@queasysnail.net>
Subject: [PATCHv2 ipsec-next 06/10] ip6_vti: support IP6IP6 tunnel processing with .cb_handler
Date: Tue, 30 Jun 2020 15:36:31 +0800 [thread overview]
Message-ID: <1b18c11f965775fed2647eb78071af89177a70b5.1593502515.git.lucien.xin@gmail.com> (raw)
In-Reply-To: <b29f04cd51bc17c22e6d34714afb3e4c17137e95.1593502515.git.lucien.xin@gmail.com>
In-Reply-To: <cover.1593502515.git.lucien.xin@gmail.com>
Similar to IPIP tunnel's processing, this patch is to support
IP6IP6 tunnel processing with .cb_handler.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/ipv6/ip6_vti.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 1147f64..2161648 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -343,6 +343,17 @@ static int vti6_rcv(struct sk_buff *skb)
return vti6_input_proto(skb, nexthdr, 0, 0);
}
+static int vti6_rcv_tunnel(struct sk_buff *skb)
+{
+ const xfrm_address_t *saddr;
+ __be32 spi;
+
+ saddr = (const xfrm_address_t *)&ipv6_hdr(skb)->saddr;
+ spi = xfrm6_tunnel_spi_lookup(dev_net(skb->dev), saddr);
+
+ return vti6_input_proto(skb, IPPROTO_IPV6, spi, 0);
+}
+
static int vti6_rcv_cb(struct sk_buff *skb, int err)
{
unsigned short family;
@@ -1218,6 +1229,13 @@ static struct xfrm6_protocol vti_ipcomp6_protocol __read_mostly = {
.priority = 100,
};
+static struct xfrm6_tunnel vti_ipv6_handler __read_mostly = {
+ .handler = vti6_rcv_tunnel,
+ .cb_handler = vti6_rcv_cb,
+ .err_handler = vti6_err,
+ .priority = 0,
+};
+
/**
* vti6_tunnel_init - register protocol and reserve needed resources
*
@@ -1243,6 +1261,10 @@ static int __init vti6_tunnel_init(void)
err = xfrm6_protocol_register(&vti_ipcomp6_protocol, IPPROTO_COMP);
if (err < 0)
goto xfrm_proto_comp_failed;
+ msg = "ipv6 tunnel";
+ err = xfrm6_tunnel_register(&vti_ipv6_handler, AF_INET6);
+ if (err < 0)
+ goto vti_tunnel_failed;
msg = "netlink interface";
err = rtnl_link_register(&vti6_link_ops);
@@ -1252,6 +1274,8 @@ static int __init vti6_tunnel_init(void)
return 0;
rtnl_link_failed:
+ err = xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
+vti_tunnel_failed:
xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);
xfrm_proto_comp_failed:
xfrm6_protocol_deregister(&vti_ah6_protocol, IPPROTO_AH);
@@ -1270,6 +1294,7 @@ static int __init vti6_tunnel_init(void)
static void __exit vti6_tunnel_cleanup(void)
{
rtnl_link_unregister(&vti6_link_ops);
+ xfrm6_tunnel_deregister(&vti_ipv6_handler, AF_INET6);
xfrm6_protocol_deregister(&vti_ipcomp6_protocol, IPPROTO_COMP);
xfrm6_protocol_deregister(&vti_ah6_protocol, IPPROTO_AH);
xfrm6_protocol_deregister(&vti_esp6_protocol, IPPROTO_ESP);
--
2.1.0
next prev parent reply other threads:[~2020-06-30 7:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 7:36 [PATCHv2 ipsec-next 00/10] xfrm: support ipip and ipv6 tunnels in vti and xfrmi Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 01/10] xfrm: add is_ipip to struct xfrm_input_afinfo Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 02/10] tunnel4: add cb_handler to struct xfrm_tunnel Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 03/10] tunnel6: add tunnel6_input_afinfo for ipip and ipv6 tunnels Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 04/10] ip_vti: support IPIP tunnel processing with .cb_handler Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 05/10] ip_vti: support IPIP6 tunnel processing Xin Long
2020-06-30 7:36 ` Xin Long [this message]
2020-06-30 7:36 ` [PATCHv2 ipsec-next 07/10] ip6_vti: support IP6IP " Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 08/10] ipcomp: assign if_id to child tunnel from parent tunnel Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 09/10] xfrm: interface: support IP6IP6 and IP6IP tunnels processing with .cb_handler Xin Long
2020-06-30 7:36 ` [PATCHv2 ipsec-next 10/10] xfrm: interface: support IPIP and IPIP6 " Xin Long
2020-07-02 23:54 ` [PATCHv2 ipsec-next 09/10] xfrm: interface: support IP6IP6 and IP6IP " kernel test robot
2020-07-05 16:57 ` Xin Long
2020-07-02 22:20 ` [PATCHv2 ipsec-next 06/10] ip6_vti: support IP6IP6 tunnel " kernel test robot
2020-07-02 23:33 ` kernel test robot
2020-07-05 16:57 ` Xin Long
2020-07-02 20:46 ` [PATCHv2 ipsec-next 02/10] tunnel4: add cb_handler to struct xfrm_tunnel kernel test robot
2020-07-02 20:53 ` kernel test robot
2020-07-05 18:30 ` Xin Long
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=1b18c11f965775fed2647eb78071af89177a70b5.1593502515.git.lucien.xin@gmail.com \
--to=lucien.xin@gmail.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=sd@queasysnail.net \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).