Commit 4f2c17e0 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 2020-01-21

1) Add support for TCP encapsulation of IKE and ESP messages,
   as defined by RFC 8229. Patchset from Sabrina Dubroca.

Please note that there is a merge conflict in:

net/unix/af_unix.c

between commit:

3c32da19 ("unix: Show number of pending scm files of receive queue in fdinfo")

from the net-next tree and commit:

b50b0580 ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram")

from the ipsec-next tree.

The conflict can be solved as done in linux-next.

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

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

include/linux/skbuff.h

+8 −3
Original line number Diff line number Diff line
@@ -3464,7 +3464,8 @@ static inline void skb_frag_list_init(struct sk_buff *skb) 
	for (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next)





int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,

int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,

				int *err, long *timeo_p,

				const struct sk_buff *skb);

struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,

					  struct sk_buff_head *queue,
@@ -3473,12 +3474,16 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, 
							   struct sk_buff *skb),

					  int *off, int *err,

					  struct sk_buff **last);

struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned flags,

struct sk_buff *__skb_try_recv_datagram(struct sock *sk,

					struct sk_buff_head *queue,

					unsigned int flags,

					void (*destructor)(struct sock *sk,

							   struct sk_buff *skb),

					int *off, int *err,

					struct sk_buff **last);

struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,

struct sk_buff *__skb_recv_datagram(struct sock *sk,

				    struct sk_buff_head *sk_queue,

				    unsigned int flags,

				    void (*destructor)(struct sock *sk,

						       struct sk_buff *skb),

				    int *off, int *err);

include/net/espintcp.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _NET_ESPINTCP_H

#define _NET_ESPINTCP_H



#include <net/strparser.h>

#include <linux/skmsg.h>



void __init espintcp_init(void);



int espintcp_push_skb(struct sock *sk, struct sk_buff *skb);

int espintcp_queue_out(struct sock *sk, struct sk_buff *skb);

bool tcp_is_ulp_esp(struct sock *sk);



struct espintcp_msg {

	struct sk_buff *skb;

	struct sk_msg skmsg;

	int offset;

	int len;

};



struct espintcp_ctx {

	struct strparser strp;

	struct sk_buff_head ike_queue;

	struct sk_buff_head out_queue;

	struct espintcp_msg partial;

	void (*saved_data_ready)(struct sock *sk);

	void (*saved_write_space)(struct sock *sk);

	struct work_struct work;

	bool tx_running;

};



static inline struct espintcp_ctx *espintcp_getctx(const struct sock *sk)

{

	struct inet_connection_sock *icsk = inet_csk(sk);



	/* RCU is only needed for diag */

	return (__force void *)icsk->icsk_ulp_data;

}

#endif

include/net/xfrm.h

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ struct xfrm_state { 


	/* Data for encapsulator */

	struct xfrm_encap_tmpl	*encap;

	struct sock __rcu	*encap_sk;



	/* Data for care-of address */

	xfrm_address_t	*coaddr;
@@ -1547,6 +1548,9 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload); 
int xfrm_init_state(struct xfrm_state *x);

int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);

int xfrm_input_resume(struct sk_buff *skb, int nexthdr);

int xfrm_trans_queue_net(struct net *net, struct sk_buff *skb,

			 int (*finish)(struct net *, struct sock *,

				       struct sk_buff *));

int xfrm_trans_queue(struct sk_buff *skb,

		     int (*finish)(struct net *, struct sock *,

				   struct sk_buff *));

include/uapi/linux/udp.h

+1 −0
Original line number Diff line number Diff line
@@ -42,5 +42,6 @@ struct udphdr { 
#define UDP_ENCAP_GTP0		4 /* GSM TS 09.60 */

#define UDP_ENCAP_GTP1U		5 /* 3GPP TS 29.060 */

#define UDP_ENCAP_RXRPC		6

#define TCP_ENCAP_ESPINTCP	7 /* Yikes, this is really xfrm encap types. */



#endif /* _UAPI_LINUX_UDP_H */

net/core/datagram.c

+17 −10
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, i 
/*

 * Wait for the last received packet to be different from skb

 */

int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,

int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,

				int *err, long *timeo_p,

				const struct sk_buff *skb)

{

	int error;
@@ -97,7 +98,7 @@ int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p, 
	if (error)

		goto out_err;



	if (READ_ONCE(sk->sk_receive_queue.prev) != skb)

	if (READ_ONCE(queue->prev) != skb)

		goto out;



	/* Socket shut down? */
@@ -209,6 +210,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, 
/**

 *	__skb_try_recv_datagram - Receive a datagram skbuff

 *	@sk: socket

 *	@queue: socket queue from which to receive

 *	@flags: MSG\_ flags

 *	@destructor: invoked under the receive lock on successful dequeue

 *	@off: an offset in bytes to peek skb from. Returns an offset
@@ -241,13 +243,14 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, 
 *	quite explicitly by POSIX 1003.1g, don't change them without having

 *	the standard around please.

 */

struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,

struct sk_buff *__skb_try_recv_datagram(struct sock *sk,

					struct sk_buff_head *queue,

					unsigned int flags,

					void (*destructor)(struct sock *sk,

							   struct sk_buff *skb),

					int *off, int *err,

					struct sk_buff **last)

{

	struct sk_buff_head *queue = &sk->sk_receive_queue;

	struct sk_buff *skb;

	unsigned long cpu_flags;

	/*
@@ -278,7 +281,7 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags, 
			break;



		sk_busy_loop(sk, flags & MSG_DONTWAIT);

	} while (READ_ONCE(sk->sk_receive_queue.prev) != *last);

	} while (READ_ONCE(queue->prev) != *last);



	error = -EAGAIN;
@@ -288,7 +291,9 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags, 
}

EXPORT_SYMBOL(__skb_try_recv_datagram);



struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,

struct sk_buff *__skb_recv_datagram(struct sock *sk,

				    struct sk_buff_head *sk_queue,

				    unsigned int flags,

				    void (*destructor)(struct sock *sk,

						       struct sk_buff *skb),

				    int *off, int *err)
@@ -299,15 +304,16 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, 
	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);



	do {

		skb = __skb_try_recv_datagram(sk, flags, destructor, off, err,

					      &last);

		skb = __skb_try_recv_datagram(sk, sk_queue, flags, destructor,

					      off, err, &last);

		if (skb)

			return skb;



		if (*err != -EAGAIN)

			break;

	} while (timeo &&

		!__skb_wait_for_more_packets(sk, err, &timeo, last));

		 !__skb_wait_for_more_packets(sk, sk_queue, err,

					      &timeo, last));



	return NULL;

}
@@ -318,7 +324,8 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags, 
{

	int off = 0;



	return __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),

	return __skb_recv_datagram(sk, &sk->sk_receive_queue,

				   flags | (noblock ? MSG_DONTWAIT : 0),

				   NULL, &off, err);

}

EXPORT_SYMBOL(skb_recv_datagram);