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

Conflicts:
	net/xfrm/xfrm_policy.c

Steffen Klassert says:

====================
This pull request has a merge conflict between commits be7928d20bab
("net: xfrm: xfrm_policy: fix inline not at beginning of declaration") and
da7c224b1baa ("net: xfrm: xfrm_policy: silence compiler warning") from
the net-next tree and commit 2f3ea9a95c58 ("xfrm: checkpatch erros with
inline keyword position") from the ipsec-next tree.

The version from net-next can be used, like it is done in linux-next.

1) Checkpatch cleanups, from Weilong Chen.

2) Fix lockdep complaints when pktgen is used with IPsec,
   from Fan Du.

3) Update pktgen to allow any combination of IPsec transport/tunnel mode
   and AH/ESP/IPcomp type, from Fan Du.

4) Make pktgen_dst_metrics static, Fengguang Wu.

5) Compile fix for pktgen when CONFIG_XFRM is not set,
   from Fan Du.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 56 insertions, 34 deletions

diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 88843996f935..6c7ac016ce3a 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -67,7 +67,7 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
         case IPPROTO_COMP:
                 if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))
                         return -EINVAL;
-                *spi = htonl(ntohs(*(__be16*)(skb_transport_header(skb) + 2)));
+                *spi = htonl(ntohs(*(__be16 *)(skb_transport_header(skb) + 2)));
                 *seq = 0;
                 return 0;
         default:
@@ -77,8 +77,8 @@ int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
         if (!pskb_may_pull(skb, hlen))
                 return -EINVAL;
 
-        *spi = *(__be32*)(skb_transport_header(skb) + offset);
-        *seq = *(__be32*)(skb_transport_header(skb) + offset_seq);
+        *spi = *(__be32 *)(skb_transport_header(skb) + offset);
+        *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
         return 0;
 }
 
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index e205c4b56afb..01770826a15a 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -171,7 +171,7 @@ static inline unsigned long make_jiffies(long secs)
 
 static void xfrm_policy_timer(unsigned long data)
 {
-        struct xfrm_policy *xp = (struct xfrm_policy*)data;
+        struct xfrm_policy *xp = (struct xfrm_policy *)data;
         unsigned long now = get_seconds();
         long next = LONG_MAX;
         int warn = 0;
@@ -1286,7 +1286,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
         xfrm_address_t *saddr = xfrm_flowi_saddr(fl, family);
         xfrm_address_t tmp;
 
-        for (nx=0, i = 0; i < policy->xfrm_nr; i++) {
+        for (nx = 0, i = 0; i < policy->xfrm_nr; i++) {
                 struct xfrm_state *x;
                 xfrm_address_t *remote = daddr;
                 xfrm_address_t *local  = saddr;
@@ -1316,9 +1316,9 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
                         error = (x->km.state == XFRM_STATE_ERROR ?
                                  -EINVAL : -EAGAIN);
                         xfrm_state_put(x);
-                }
-                else if (error == -ESRCH)
+                } else if (error == -ESRCH) {
                         error = -EAGAIN;
+                }
 
                 if (!tmpl->optional)
                         goto fail;
@@ -1326,7 +1326,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
         return nx;
 
 fail:
-        for (nx--; nx>=0; nx--)
+        for (nx--; nx >= 0; nx--)
                 xfrm_state_put(xfrm[nx]);
         return error;
 }
@@ -1363,7 +1363,7 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl,
         return cnx;
 
  fail:
-        for (cnx--; cnx>=0; cnx--)
+        for (cnx--; cnx >= 0; cnx--)
                 xfrm_state_put(tpp[cnx]);
         return error;
 
@@ -1706,7 +1706,7 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family,
                                 xfrm_pols_put(pols, *num_pols);
                                 return PTR_ERR(pols[1]);
                         }
-                        (*num_pols) ++;
+                        (*num_pols)++;
                         (*num_xfrms) += pols[1]->xfrm_nr;
                 }
         }
@@ -1760,7 +1760,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
         }
 
         xdst->num_pols = num_pols;
-        memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
+        memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
         xdst->policy_genid = atomic_read(&pols[0]->genid);
 
         return xdst;
@@ -2029,7 +2029,7 @@ make_dummy_bundle:
         }
         xdst->num_pols = num_pols;
         xdst->num_xfrms = num_xfrms;
-        memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
+        memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
 
         dst_hold(&xdst->u.dst);
         return &xdst->flo;
@@ -2138,7 +2138,7 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
 
                 num_pols = xdst->num_pols;
                 num_xfrms = xdst->num_xfrms;
-                memcpy(pols, xdst->pols, sizeof(struct xfrm_policy*) * num_pols);
+                memcpy(pols, xdst->pols, sizeof(struct xfrm_policy *) * num_pols);
                 route = xdst->route;
         }
 
@@ -2334,7 +2334,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
         if (skb->sp) {
                 int i;
 
-                for (i=skb->sp->len-1; i>=0; i--) {
+                for (i = skb->sp->len-1; i >= 0; i--) {
                         struct xfrm_state *x = skb->sp->xvec[i];
                         if (!xfrm_selector_match(&x->sel, &fl, family)) {
                                 XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMISMATCH);
@@ -2380,7 +2380,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
         pol->curlft.use_time = get_seconds();
 
         pols[0] = pol;
-        npols ++;
+        npols++;
 #ifdef CONFIG_XFRM_SUB_POLICY
         if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) {
                 pols[1] = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN,
@@ -2392,7 +2392,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
                                 return 0;
                         }
                         pols[1]->curlft.use_time = get_seconds();
-                        npols ++;
+                        npols++;
                 }
         }
 #endif
@@ -2989,7 +2989,7 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
                 audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s",
                                  ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str);
 
-        switch(sel->family) {
+        switch (sel->family) {
         case AF_INET:
                 audit_log_format(audit_buf, " src=%pI4", &sel->saddr.a4);
                 if (sel->prefixlen_s != 32)
@@ -3066,8 +3066,8 @@ static bool xfrm_migrate_selector_match(const struct xfrm_selector *sel_cmp,
         return false;
 }
 
-static struct xfrm_policy * xfrm_migrate_policy_find(const struct xfrm_selector *sel,
-                                                     u8 dir, u8 type, struct net *net)
+static struct xfrm_policy *xfrm_migrate_policy_find(const struct xfrm_selector *sel,
+                                                    u8 dir, u8 type, struct net *net)
 {
         struct xfrm_policy *pol, *ret = NULL;
         struct hlist_head *chain;
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index 80cd1e55b834..fc5abd0b456f 100644
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -52,7 +52,7 @@ static int xfrm_statistics_seq_show(struct seq_file *seq, void *v)
 {
         struct net *net = seq->private;
         int i;
-        for (i=0; xfrm_mib_list[i].name; i++)
+        for (i = 0; xfrm_mib_list[i].name; i++)
                 seq_printf(seq, "%-24s\t%lu\n", xfrm_mib_list[i].name,
                            snmp_fold_field((void __percpu **)
                                            net->mib.xfrm_statistics,
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index a62c25ea3631..62181486ead8 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -382,7 +382,7 @@ static inline unsigned long make_jiffies(long secs)
                 return secs*HZ;
 }
 
-static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
+static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
 {
         struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);
         struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer);
@@ -448,7 +448,7 @@ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer * me)
         if (warn)
                 km_state_expired(x, 0, 0);
 resched:
-        if (next != LONG_MAX){
+        if (next != LONG_MAX) {
                 tasklet_hrtimer_start(&x->mtimer, ktime_set(next, 0), HRTIMER_MODE_REL);
         }
 
@@ -890,7 +890,7 @@ xfrm_stateonly_find(struct net *net, u32 mark,
         unsigned int h;
         struct xfrm_state *rx = NULL, *x = NULL;
 
-        spin_lock(&net->xfrm.xfrm_state_lock);
+        spin_lock_bh(&net->xfrm.xfrm_state_lock);
         h = xfrm_dst_hash(net, daddr, saddr, reqid, family);
         hlist_for_each_entry(x, net->xfrm.state_bydst+h, bydst) {
                 if (x->props.family == family &&
@@ -908,13 +908,35 @@ xfrm_stateonly_find(struct net *net, u32 mark,
 
         if (rx)
                 xfrm_state_hold(rx);
-        spin_unlock(&net->xfrm.xfrm_state_lock);
+        spin_unlock_bh(&net->xfrm.xfrm_state_lock);
 
 
         return rx;
 }
 EXPORT_SYMBOL(xfrm_stateonly_find);
 
+struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi,
+                                              unsigned short family)
+{
+        struct xfrm_state *x;
+        struct xfrm_state_walk *w;
+
+        spin_lock_bh(&net->xfrm.xfrm_state_lock);
+        list_for_each_entry(w, &net->xfrm.state_all, all) {
+                x = container_of(w, struct xfrm_state, km);
+                if (x->props.family != family ||
+                        x->id.spi != spi)
+                        continue;
+
+                spin_unlock_bh(&net->xfrm.xfrm_state_lock);
+                xfrm_state_hold(x);
+                return x;
+        }
+        spin_unlock_bh(&net->xfrm.xfrm_state_lock);
+        return NULL;
+}
+EXPORT_SYMBOL(xfrm_state_lookup_byspi);
+
 static void __xfrm_state_insert(struct xfrm_state *x)
 {
         struct net *net = xs_net(x);
@@ -1237,8 +1259,8 @@ struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *n
 }
 EXPORT_SYMBOL(xfrm_migrate_state_find);
 
-struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
-                                       struct xfrm_migrate *m)
+struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,
+                                      struct xfrm_migrate *m)
 {
         struct xfrm_state *xc;
         int err;
@@ -1348,7 +1370,7 @@ int xfrm_state_check_expire(struct xfrm_state *x)
         if (x->curlft.bytes >= x->lft.hard_byte_limit ||
             x->curlft.packets >= x->lft.hard_packet_limit) {
                 x->km.state = XFRM_STATE_EXPIRED;
-                tasklet_hrtimer_start(&x->mtimer, ktime_set(0,0), HRTIMER_MODE_REL);
+                tasklet_hrtimer_start(&x->mtimer, ktime_set(0, 0), HRTIMER_MODE_REL);
                 return -EINVAL;
         }
 
@@ -1542,7 +1564,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
                 x->id.spi = minspi;
         } else {
                 u32 spi = 0;
-                for (h=0; h<high-low+1; h++) {
+                for (h = 0; h < high-low+1; h++) {
                         spi = low + net_random()%(high-low+1);
                         x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
                         if (x0 == NULL) {
@@ -1630,7 +1652,7 @@ EXPORT_SYMBOL(xfrm_state_walk_done);
 
 static void xfrm_replay_timer_handler(unsigned long data)
 {
-        struct xfrm_state *x = (struct xfrm_state*)data;
+        struct xfrm_state *x = (struct xfrm_state *)data;
 
         spin_lock(&x->lock);
 
@@ -2079,7 +2101,7 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
                 audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s",
                                  ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str);
 
-        switch(x->props.family) {
+        switch (x->props.family) {
         case AF_INET:
                 audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
                                  &x->props.saddr.a4, &x->id.daddr.a4);
@@ -2109,7 +2131,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
                 iph6 = ipv6_hdr(skb);
                 audit_log_format(audit_buf,
                                  " src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
-                                 &iph6->saddr,&iph6->daddr,
+                                 &iph6->saddr, &iph6->daddr,
                                  iph6->flow_lbl[0] & 0x0f,
                                  iph6->flow_lbl[1],
                                  iph6->flow_lbl[2]);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 97681a390402..334856689b0d 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1731,11 +1731,11 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, const struct
                 return -EMSGSIZE;
 
         id = nlmsg_data(nlh);
-        memcpy(&id->sa_id.daddr, &x->id.daddr,sizeof(x->id.daddr));
+        memcpy(&id->sa_id.daddr, &x->id.daddr, sizeof(x->id.daddr));
         id->sa_id.spi = x->id.spi;
         id->sa_id.family = x->props.family;
         id->sa_id.proto = x->id.proto;
-        memcpy(&id->saddr, &x->props.saddr,sizeof(x->props.saddr));
+        memcpy(&id->saddr, &x->props.saddr, sizeof(x->props.saddr));
         id->reqid = x->props.reqid;
         id->flags = c->data.aevent;
 
@@ -1824,7 +1824,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
         struct net *net = sock_net(skb->sk);
         struct xfrm_state *x;
         struct km_event c;
-        int err = - EINVAL;
+        int err = -EINVAL;
         u32 mark = 0;
         struct xfrm_mark m;
         struct xfrm_aevent_id *p = nlmsg_data(nlh);