Commit 4461568a authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Access &tcp_hashinfo via net. 



We will soon introduce an optional per-netns ehash.

This means we cannot use tcp_hashinfo directly in most places.

Instead, access it via net->ipv4.tcp_death_row.hashinfo.

The access will be valid only while initialising tcp_hashinfo
itself and creating/destroying each netns.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 429e42c1

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c

+2 −3
Original line number Diff line number Diff line
@@ -1069,8 +1069,7 @@ static void chtls_pass_accept_rpl(struct sk_buff *skb, 
	cxgb4_l2t_send(csk->egress_dev, skb, csk->l2t_entry);

}



static void inet_inherit_port(struct inet_hashinfo *hash_info,

			      struct sock *lsk, struct sock *newsk)

static void inet_inherit_port(struct sock *lsk, struct sock *newsk)

{

	local_bh_disable();

	__inet_inherit_port(lsk, newsk);
@@ -1240,7 +1239,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
						     ipv4.sysctl_tcp_window_scaling),

					   tp->window_clamp);

	neigh_release(n);

	inet_inherit_port(&tcp_hashinfo, lsk, newsk);

	inet_inherit_port(lsk, newsk);

	csk_set_flag(csk, CSK_CONN_INLINE);

	bh_unlock_sock(newsk); /* tcp_create_openreq_child ->sk_clone_lock */

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c

+3 −2
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static void resync_update_sn(struct mlx5e_rq *rq, struct sk_buff *skb) 
{

	struct ethhdr *eth = (struct ethhdr *)(skb->data);

	struct net_device *netdev = rq->netdev;

	struct net *net = dev_net(netdev);

	struct sock *sk = NULL;

	unsigned int datalen;

	struct iphdr *iph;
@@ -475,7 +476,7 @@ static void resync_update_sn(struct mlx5e_rq *rq, struct sk_buff *skb) 
		depth += sizeof(struct iphdr);

		th = (void *)iph + sizeof(struct iphdr);



		sk = inet_lookup_established(dev_net(netdev), &tcp_hashinfo,

		sk = inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo,

					     iph->saddr, th->source, iph->daddr,

					     th->dest, netdev->ifindex);

#if IS_ENABLED(CONFIG_IPV6)
@@ -485,7 +486,7 @@ static void resync_update_sn(struct mlx5e_rq *rq, struct sk_buff *skb) 
		depth += sizeof(struct ipv6hdr);

		th = (void *)ipv6h + sizeof(struct ipv6hdr);



		sk = __inet6_lookup_established(dev_net(netdev), &tcp_hashinfo,

		sk = __inet6_lookup_established(net, net->ipv4.tcp_death_row.hashinfo,

						&ipv6h->saddr, th->source,

						&ipv6h->daddr, ntohs(th->dest),

						netdev->ifindex, 0);

drivers/net/ethernet/netronome/nfp/crypto/tls.c

+3 −2
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ int nfp_net_tls_rx_resync_req(struct net_device *netdev, 
{

	struct nfp_net *nn = netdev_priv(netdev);

	struct nfp_net_tls_offload_ctx *ntls;

	struct net *net = dev_net(netdev);

	struct ipv6hdr *ipv6h;

	struct tcphdr *th;

	struct iphdr *iph;
@@ -494,13 +495,13 @@ int nfp_net_tls_rx_resync_req(struct net_device *netdev, 


	switch (ipv6h->version) {

	case 4:

		sk = inet_lookup_established(dev_net(netdev), &tcp_hashinfo,

		sk = inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo,

					     iph->saddr, th->source, iph->daddr,

					     th->dest, netdev->ifindex);

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case 6:

		sk = __inet6_lookup_established(dev_net(netdev), &tcp_hashinfo,

		sk = __inet6_lookup_established(net, net->ipv4.tcp_death_row.hashinfo,

						&ipv6h->saddr, th->source,

						&ipv6h->daddr, ntohs(th->dest),

						netdev->ifindex, 0);

net/core/filter.c

+3 −2
Original line number Diff line number Diff line
@@ -6373,6 +6373,7 @@ static const struct bpf_func_proto bpf_lwt_seg6_adjust_srh_proto = { 
static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,

			      int dif, int sdif, u8 family, u8 proto)

{

	struct inet_hashinfo *hinfo = net->ipv4.tcp_death_row.hashinfo;

	bool refcounted = false;

	struct sock *sk = NULL;
@@ -6381,7 +6382,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple, 
		__be32 dst4 = tuple->ipv4.daddr;



		if (proto == IPPROTO_TCP)

			sk = __inet_lookup(net, &tcp_hashinfo, NULL, 0,

			sk = __inet_lookup(net, hinfo, NULL, 0,

					   src4, tuple->ipv4.sport,

					   dst4, tuple->ipv4.dport,

					   dif, sdif, &refcounted);
@@ -6395,7 +6396,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple, 
		struct in6_addr *dst6 = (struct in6_addr *)&tuple->ipv6.daddr;



		if (proto == IPPROTO_TCP)

			sk = __inet6_lookup(net, &tcp_hashinfo, NULL, 0,

			sk = __inet6_lookup(net, hinfo, NULL, 0,

					    src6, tuple->ipv6.sport,

					    dst6, ntohs(tuple->ipv6.dport),

					    dif, sdif, &refcounted);

net/ipv4/esp4.c

+2 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static void esp_free_tcp_sk(struct rcu_head *head) 
static struct sock *esp_find_tcp_sk(struct xfrm_state *x)

{

	struct xfrm_encap_tmpl *encap = x->encap;

	struct net *net = xs_net(x);

	struct esp_tcp_sk *esk;

	__be16 sport, dport;

	struct sock *nsk;
@@ -160,7 +161,7 @@ static struct sock *esp_find_tcp_sk(struct xfrm_state *x) 
	}

	spin_unlock_bh(&x->lock);



	sk = inet_lookup_established(xs_net(x), &tcp_hashinfo, x->id.daddr.a4,

	sk = inet_lookup_established(net, net->ipv4.tcp_death_row.hashinfo, x->id.daddr.a4,

				     dport, x->props.saddr.a4, sport, 0);

	if (!sk)

		return ERR_PTR(-ENOENT);