pull request (net-next): ipsec-next 2013-09-26
Subsystems (4)
Steffen Klassert
maintainerTwo patches that are left from the last development cycle. Manual merging of include/net/xfrm.h is needed. The conflict can be solved as it is currently done in linux-next.
1) We announce the creation of temporary acquire state via an asyc event, so the deletion should be annunced too. From Nicolas Dichtel.
2) The VTI tunnels do not real tunning, they just provide a routable IPsec tunnel interface. So introduce and use xfrm_tunnel_notifier instead of xfrm_tunnel for xfrm tunnel mode callback. From Fan Du.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit b4de77ade3fc56e41b978b68d78a351dab28b74e:
ipip: potential race in ip_tunnel_init_net() (2013-08-25 18:39:59 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
for you to fetch changes up to aba8269588301f7778bea811d6f7ec74c2e37279:
{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback (2013-08-28 09:22:17 +0200)
----------------------------------------------------------------
Fan Du (1):
{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback
Nicolas Dichtel (1):
xfrm: announce deleation of temporary SA
include/net/xfrm.h | 10 +++++-- net/ipv4/ip_vti.c | 67 +----------------------------------------- net/ipv4/xfrm4_mode_tunnel.c | 16 +++++----- net/xfrm/xfrm_state.c | 2 +- 4 files changed, 18 insertions(+), 77 deletions(-)
Steffen Klassert
maintainerPATCH 1/2 xfrm: announce deleation of temporary SA
From: Nicolas Dichtel <[email protected]>
Creation of temporary SA are announced by netlink, but there is no notification for the deletion.
This patch fix this asymmetric situation.
--- net/xfrm/xfrm_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_state.c +1 -1
@@ -471,7 +471,7 @@ expired: } err =__xfrm_state_delete (x); -if (!err && x->id.spi) +if (!err)km_state_expired (x,1 ,0 ); xfrm_audit_state_delete(x, err ? 0 : 1,
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 2/2 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
Some thoughts on IPv4 VTI implementation:
The connection between VTI receiving part and xfrm tunnel mode input process is hardly a "xfrm_tunnel", xfrm_tunnel is used in places where, e.g ipip/sit and xfrm4_tunnel, acts like a true "tunnel" device.
In addition, IMHO, VTI doesn't need vti_err to do something meaningful, as all VTI needs is just a notifier to be called whenever xfrm_input ingress a packet to update statistics.
A IPsec protected packet is first handled by protocol handlers, e.g AH/ESP, to check packet authentication or encryption rightness. PMTU update is taken care of in this stage by protocol error handler.
Then the packet is rearranged properly depending on whether it's transport mode or tunnel mode packed by mode "input" handler. The VTI handler code takes effects in this stage in tunnel mode only. So it neither need propagate PMTU, as it has already been done if necessary, nor the VTI handler is qualified as a xfrm_tunnel.
So this patch introduces xfrm_tunnel_notifier and meanwhile wipe out vti_err code.
--- include/net/xfrm.h | 10 +++++-- net/ipv4/ip_vti.c | 67 +----------------------------------------- net/ipv4/xfrm4_mode_tunnel.c | 16 +++++----- 3 files changed, 17 insertions(+), 76 deletions(-)
include/net/xfrm.h +8 -2
@@ -1352,6 +1352,12 @@ struct xfrm_tunnel {int priority; }; +struct xfrm_tunnel_notifier { +int (*handler)(struct sk_buff *skb); +struct xfrm_tunnel_notifier __rcu *next; +int priority; +}; +struct xfrm6_tunnel {int (*handler)(struct sk_buff *skb); int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -1495,8 +1501,8 @@ extern int xfrm4_output(struct sk_buff *skb);extern int xfrm4_output_finish (struct sk_buff *skb);extern int xfrm4_tunnel_register (struct xfrm_tunnel *handler,unsigned short family);extern int xfrm4_tunnel_deregister (struct xfrm_tunnel *handler,unsigned short family); -extern int xfrm4_mode_tunnel_input_register (struct xfrm_tunnel *handler); -extern int xfrm4_mode_tunnel_input_deregister (struct xfrm_tunnel *handler); +extern int xfrm4_mode_tunnel_input_register (struct xfrm_tunnel_notifier *handler); +extern int xfrm4_mode_tunnel_input_deregister (struct xfrm_tunnel_notifier *handler);extern int xfrm6_extract_header (struct sk_buff *skb);extern int xfrm6_extract_input (struct xfrm_state *x,struct sk_buff *skb);extern int xfrm6_rcv_spi (struct sk_buff *skb,int nexthdr,__be32 spi);
net/ipv4/ip_vti.c +1 -66
80 lines not on this page · raw message
net/ipv4/xfrm4_mode_tunnel.c +8 -8
@@ -16,13 +16,13 @@#include <net/xfrm.h> /* Informational hook. The decap is still done here. */ -static struct xfrm_tunnel __rcu *rcv_notify_handlers__read_mostly ; +static struct xfrm_tunnel_notifier __rcu *rcv_notify_handlers__read_mostly ;static DEFINE_MUTEX (xfrm4_mode_tunnel_input_mutex); -int xfrm4_mode_tunnel_input_register (struct xfrm_tunnel *handler) +int xfrm4_mode_tunnel_input_register (struct xfrm_tunnel_notifier *handler) { -struct xfrm_tunnel __rcu **pprev; -struct xfrm_tunnel *t; +struct xfrm_tunnel_notifier __rcu **pprev; +struct xfrm_tunnel_notifier *t;int ret = -EEXIST ;int priority = handler->priority;
@@ -50,10 +50,10 @@ err: }EXPORT_SYMBOL_GPL (xfrm4_mode_tunnel_input_register); -int xfrm4_mode_tunnel_input_deregister (struct xfrm_tunnel *handler) +int xfrm4_mode_tunnel_input_deregister (struct xfrm_tunnel_notifier *handler) { -struct xfrm_tunnel __rcu **pprev; -struct xfrm_tunnel *t; +struct xfrm_tunnel_notifier __rcu **pprev; +struct xfrm_tunnel_notifier *t;int ret = -ENOENT ;mutex_lock (&xfrm4_mode_tunnel_input_mutex);
@@ -134,7 +134,7 @@ static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)static int xfrm4_mode_tunnel_input (struct xfrm_state *x,struct sk_buff *skb) { -struct xfrm_tunnel *handler; +struct xfrm_tunnel_notifier *handler;int err = -EINVAL ;if (XFRM_MODE_SKB_CB (skb)->protocol !=IPPROTO_IPIP )
Signature · 1 line
1.7.9.5
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Thu, 26 Sep 2013 10:58:41 +0200
Quoted 4 lines
Two patches that are left from the last development cycle. Manual merging of
include/net/xfrm.his needed. The conflict can be solved as it is currently done in linux-next.
Quoted 8 lines
1) We announce the creation of temporary acquire state via an asyc event, so the deletion should be annunced too. From Nicolas Dichtel.
2) The VTI tunnels do not real tunning, they just provide a routable IPsec tunnel interface. So introduce and use
xfrm_tunnel_notifierinstead ofxfrm_tunnelfor xfrm tunnel mode callback. From Fan Du.Please pull or let me know if there are problems.
Pulled, thanks a lot!