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

Merge branch 'udp-fwd-mem-sched-on-dequeue' 



Paolo Abeni says:

====================
udp: do fwd memory scheduling on dequeue

After commit 850cbadd ("udp: use it's own memory accounting schema"),
the udp code needs to acquire twice the receive queue spinlock on dequeue.

This patch series remove the need for the second lock at skb free time,
moving the udp memory scheduling inside the dequeue operation; the skb
destructor field is not used anymore and an additional sk argument is added
to ip_cmsg_recv_offset() to cope with null skb->sk after dequeue.

Many thanks to Eric Dumazed for suggesting pretty all much the above.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cd2c0f45 7c13f97f

include/linux/skbuff.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -3033,9 +3033,13 @@ static inline void skb_frag_list_init(struct sk_buff *skb) 
int __skb_wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,

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

				const struct sk_buff *skb);

				const struct sk_buff *skb);

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

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

					void (*destructor)(struct sock *sk,

							   struct sk_buff *skb),

					int *peeked, int *off, int *err,

					int *peeked, int *off, int *err,

					struct sk_buff **last);

					struct sk_buff **last);

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

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

				    void (*destructor)(struct sock *sk,

						       struct sk_buff *skb),

				    int *peeked, int *off, int *err);

				    int *peeked, int *off, int *err);

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,

				  int *err);

				  int *err);

include/net/ip.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -579,7 +579,8 @@ int ip_options_rcv_srr(struct sk_buff *skb); 
 */

 */





void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb);

void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb);

void ip_cmsg_recv_offset(struct msghdr *msg, struct sk_buff *skb, int tlen, int offset);

void ip_cmsg_recv_offset(struct msghdr *msg, struct sock *sk,

			 struct sk_buff *skb, int tlen, int offset);

int ip_cmsg_send(struct sock *sk, struct msghdr *msg,

int ip_cmsg_send(struct sock *sk, struct msghdr *msg,

		 struct ipcm_cookie *ipc, bool allow_ipv6);

		 struct ipcm_cookie *ipc, bool allow_ipv6);

int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,

int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
@@ -601,7 +602,7 @@ void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport, 




static inline void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb)

static inline void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb)

{

{

	ip_cmsg_recv_offset(msg, skb, 0, 0);

	ip_cmsg_recv_offset(msg, skb->sk, skb, 0, 0);

}

}





bool icmp_global_allow(void);

bool icmp_global_allow(void);

include/net/udp.h

+15 −0
Original line number Original line Diff line number Diff line
@@ -248,6 +248,21 @@ static inline __be16 udp_flow_src_port(struct net *net, struct sk_buff *skb, 
/* net/ipv4/udp.c */

/* net/ipv4/udp.c */

void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len);

void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len);

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

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

void udp_skb_destructor(struct sock *sk, struct sk_buff *skb);

static inline struct sk_buff *

__skb_recv_udp(struct sock *sk, unsigned int flags, int noblock, int *peeked,

	       int *off, int *err)

{

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

				   udp_skb_destructor, peeked, off, err);

}

static inline struct sk_buff *skb_recv_udp(struct sock *sk, unsigned int flags,

					   int noblock, int *err)

{

	int peeked, off = 0;



	return __skb_recv_udp(sk, flags, noblock, &peeked, &off, err);

}





void udp_v4_early_demux(struct sk_buff *skb);

void udp_v4_early_demux(struct sk_buff *skb);

int udp_get_port(struct sock *sk, unsigned short snum,

int udp_get_port(struct sock *sk, unsigned short snum,

net/core/datagram.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -165,6 +165,7 @@ done: 
 *	__skb_try_recv_datagram - Receive a datagram skbuff

 *	__skb_try_recv_datagram - Receive a datagram skbuff

 *	@sk: socket

 *	@sk: socket

 *	@flags: MSG_ flags

 *	@flags: MSG_ flags

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

 *	@peeked: returns non-zero if this packet has been seen before

 *	@peeked: returns non-zero if this packet has been seen before

 *	@off: an offset in bytes to peek skb from. Returns an offset

 *	@off: an offset in bytes to peek skb from. Returns an offset

 *	      within an skb where data actually starts

 *	      within an skb where data actually starts
@@ -197,6 +198,8 @@ done: 
 *	the standard around please.

 *	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, unsigned int flags,

					void (*destructor)(struct sock *sk,

							   struct sk_buff *skb),

					int *peeked, int *off, int *err,

					int *peeked, int *off, int *err,

					struct sk_buff **last)

					struct sk_buff **last)

{

{
@@ -241,9 +244,11 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags, 
				}

				}





				atomic_inc(&skb->users);

				atomic_inc(&skb->users);

			} else

			} else {

				__skb_unlink(skb, queue);

				__skb_unlink(skb, queue);



				if (destructor)

					destructor(sk, skb);

			}

			spin_unlock_irqrestore(&queue->lock, cpu_flags);

			spin_unlock_irqrestore(&queue->lock, cpu_flags);

			*off = _off;

			*off = _off;

			return skb;

			return skb;
@@ -262,6 +267,8 @@ no_packet: 
EXPORT_SYMBOL(__skb_try_recv_datagram);

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, unsigned int flags,

				    void (*destructor)(struct sock *sk,

						       struct sk_buff *skb),

				    int *peeked, int *off, int *err)

				    int *peeked, int *off, int *err)

{

{

	struct sk_buff *skb, *last;

	struct sk_buff *skb, *last;
@@ -270,8 +277,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, 
	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);

	timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);





	do {

	do {

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

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

					      &last);

					      off, err, &last);

		if (skb)

		if (skb)

			return skb;

			return skb;
@@ -290,7 +297,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags, 
	int peeked, off = 0;

	int peeked, off = 0;





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

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

				   &peeked, &off, err);

				   NULL, &peeked, &off, err);

}

}

EXPORT_SYMBOL(skb_recv_datagram);

EXPORT_SYMBOL(skb_recv_datagram);

net/ipv4/ip_sockglue.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -164,10 +164,10 @@ static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb) 
	put_cmsg(msg, SOL_IP, IP_ORIGDSTADDR, sizeof(sin), &sin);

	put_cmsg(msg, SOL_IP, IP_ORIGDSTADDR, sizeof(sin), &sin);

}

}





void ip_cmsg_recv_offset(struct msghdr *msg, struct sk_buff *skb,

void ip_cmsg_recv_offset(struct msghdr *msg, struct sock *sk,

			 int tlen, int offset)

			 struct sk_buff *skb, int tlen, int offset)

{

{

	struct inet_sock *inet = inet_sk(skb->sk);

	struct inet_sock *inet = inet_sk(sk);

	unsigned int flags = inet->cmsg_flags;

	unsigned int flags = inet->cmsg_flags;





	/* Ordered by supposed usage frequency */

	/* Ordered by supposed usage frequency */

CRA Git | Maintained and supported by SUSTech CRA and CCSE