Commit 77c7a7b3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2018-12-18

1) Add xfrm policy selftest scripts.
   From Florian Westphal.

2) Split inexact policies into four different search list
   classes and use the rbtree infrastructure to store/lookup
   the policies. This is to improve the policy lookup
   performance after the flowcache removal.
   Patches from Florian Westphal.

3) Various coding style fixes, from Colin Ian King.

4) Fix policy lookup logic after adding the inexact policy
   search tree infrastructure. From Florian Westphal.

5) Remove a useless remove BUG_ON from xfrm6_dst_ifdown.
   From Li RongQing.

6) Use the correct policy direction for lookups on hash
   rebuilding. From Florian Westphal.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b12c97d4 77990464

include/net/netns/xfrm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/list.h>

#include <linux/list.h>

#include <linux/wait.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/rhashtable-types.h>

#include <linux/xfrm.h>

#include <linux/xfrm.h>

#include <net/dst_ops.h>

#include <net/dst_ops.h>
@@ -53,6 +54,7 @@ struct netns_xfrm { 
	unsigned int		policy_count[XFRM_POLICY_MAX * 2];

	unsigned int		policy_count[XFRM_POLICY_MAX * 2];

	struct work_struct	policy_hash_work;

	struct work_struct	policy_hash_work;

	struct xfrm_policy_hthresh policy_hthresh;

	struct xfrm_policy_hthresh policy_hthresh;

	struct list_head	inexact_bins;









	struct sock		*nlsk;

	struct sock		*nlsk;

include/net/xfrm.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -577,6 +577,7 @@ struct xfrm_policy { 
	/* This lock only affects elements except for entry. */

	/* This lock only affects elements except for entry. */

	rwlock_t		lock;

	rwlock_t		lock;

	refcount_t		refcnt;

	refcount_t		refcnt;

	u32			pos;

	struct timer_list	timer;

	struct timer_list	timer;





	atomic_t		genid;

	atomic_t		genid;
@@ -589,6 +590,7 @@ struct xfrm_policy { 
	struct xfrm_lifetime_cur curlft;

	struct xfrm_lifetime_cur curlft;

	struct xfrm_policy_walk_entry walk;

	struct xfrm_policy_walk_entry walk;

	struct xfrm_policy_queue polq;

	struct xfrm_policy_queue polq;

	bool                    bydst_reinsert;

	u8			type;

	u8			type;

	u8			action;

	u8			action;

	u8			flags;

	u8			flags;
@@ -596,6 +598,7 @@ struct xfrm_policy { 
	u16			family;

	u16			family;

	struct xfrm_sec_ctx	*security;

	struct xfrm_sec_ctx	*security;

	struct xfrm_tmpl       	xfrm_vec[XFRM_MAX_DEPTH];

	struct xfrm_tmpl       	xfrm_vec[XFRM_MAX_DEPTH];

	struct hlist_node	bydst_inexact_list;

	struct rcu_head		rcu;

	struct rcu_head		rcu;

};

};

net/ipv6/xfrm6_policy.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,6 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, 
	if (xdst->u.rt6.rt6i_idev->dev == dev) {

	if (xdst->u.rt6.rt6i_idev->dev == dev) {

		struct inet6_dev *loopback_idev =

		struct inet6_dev *loopback_idev =

			in6_dev_get(dev_net(dev)->loopback_dev);

			in6_dev_get(dev_net(dev)->loopback_dev);

		BUG_ON(!loopback_idev);





		do {

		do {

			in6_dev_put(xdst->u.rt6.rt6i_idev);

			in6_dev_put(xdst->u.rt6.rt6i_idev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE