Commit e43b76ab authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tcp-receive-path-optimizations' 

Eric Dumazet says:

====================
tcp: receive path optimizations

This series aims to reduce cache line misses in RX path.

I am still working on better cache locality in tcp_sock but
this will wait few more weeks.
====================

Link: https://lore.kernel.org/r/20211025164825.259415-1-eric.dumazet@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fd559a94 12c8691d

include/linux/ipv6.h

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ struct ipv6_pinfo { 
	__be32			rcv_flowinfo;



	__u32			dst_cookie;

	__u32			rx_dst_cookie;



	struct ipv6_mc_socklist	__rcu *ipv6_mc_list;

	struct ipv6_ac_socklist	*ipv6_ac_list;

include/net/busy_poll.h

+2 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static inline void skb_mark_napi_id(struct sk_buff *skb, 
static inline void sk_mark_napi_id(struct sock *sk, const struct sk_buff *skb)

{

#ifdef CONFIG_NET_RX_BUSY_POLL

	if (unlikely(READ_ONCE(sk->sk_napi_id) != skb->napi_id))

		WRITE_ONCE(sk->sk_napi_id, skb->napi_id);

#endif

	sk_rx_queue_set(sk, skb);

include/net/inet_sock.h

+1 −2
Original line number Diff line number Diff line
@@ -207,11 +207,10 @@ struct inet_sock { 
	__be32			inet_saddr;

	__s16			uc_ttl;

	__u16			cmsg_flags;

	struct ip_options_rcu __rcu	*inet_opt;

	__be16			inet_sport;

	__u16			inet_id;



	struct ip_options_rcu __rcu	*inet_opt;

	int			rx_dst_ifindex;

	__u8			tos;

	__u8			min_ttl;

	__u8			mc_ttl;

include/net/ip.h

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

#include <linux/jhash.h>

#include <linux/sockptr.h>

#include <linux/static_key.h>



#include <net/inet_sock.h>

#include <net/route.h>
@@ -750,6 +751,7 @@ 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,

		 struct ipcm_cookie *ipc, bool allow_ipv6);

DECLARE_STATIC_KEY_FALSE(ip4_min_ttl);

int ip_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,

		  unsigned int optlen);

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

include/net/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,7 @@ struct in6_addr *fl6_update_dst(struct flowi6 *fl6, 
/*

 *	socket options (ipv6_sockglue.c)

 */

DECLARE_STATIC_KEY_FALSE(ip6_min_hopcount);



int ipv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,

		    unsigned int optlen);