Commit 6d45984b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tcp-follow-up-for-dccp-removal' 

Kuniyuki Iwashima says:

====================
tcp: Follow up for DCCP removal.

As I mentioned in [0], TCP still has code for DCCP.

This series cleans up such leftovers.

[0]: https://patch.msgid.link/20250410023921.11307-3-kuniyu@amazon.com

v1: https://lore.kernel.org/20250821061540.2876953-1-kuniyu@google.com
====================

Link: https://patch.msgid.link/20250822190803.540788-1-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ee6960bd 382a4d9c

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

+4 −5
Original line number Diff line number Diff line
@@ -498,9 +498,9 @@ 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(net, net->ipv4.tcp_death_row.hashinfo,

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

					     th->dest, netdev->ifindex);

		sk = inet_lookup_established(net, iph->saddr, th->source,

					     iph->daddr, th->dest,

					     netdev->ifindex);

#if IS_ENABLED(CONFIG_IPV6)

	} else {

		struct ipv6hdr *ipv6h = (struct ipv6hdr *)iph;
@@ -508,8 +508,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(net, net->ipv4.tcp_death_row.hashinfo,

						&ipv6h->saddr, th->source,

		sk = __inet6_lookup_established(net, &ipv6h->saddr, th->source,

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

						netdev->ifindex, 0);

#endif

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

+4 −5
Original line number Diff line number Diff line
@@ -495,14 +495,13 @@ int nfp_net_tls_rx_resync_req(struct net_device *netdev, 


	switch (ipv6h->version) {

	case 4:

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

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

					     th->dest, netdev->ifindex);

		sk = inet_lookup_established(net, iph->saddr, th->source,

					     iph->daddr, th->dest,

					     netdev->ifindex);

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case 6:

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

						&ipv6h->saddr, th->source,

		sk = __inet6_lookup_established(net, &ipv6h->saddr, th->source,

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

						netdev->ifindex, 0);

		break;

include/linux/inet_diag.h

+0 −13
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ struct inet_diag_handler { 
					 bool net_admin,

					 struct sk_buff *skb);



	size_t		(*idiag_get_aux_size)(struct sock *sk,

					      bool net_admin);



	int		(*destroy)(struct sk_buff *in_skb,

				   const struct inet_diag_req_v2 *req);
@@ -48,16 +45,6 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
		      struct sk_buff *skb, struct netlink_callback *cb,

		      const struct inet_diag_req_v2 *req,

		      u16 nlmsg_flags, bool net_admin);

void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,

			 struct netlink_callback *cb,

			 const struct inet_diag_req_v2 *r);

int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,

			    struct netlink_callback *cb,

			    const struct inet_diag_req_v2 *req);



struct sock *inet_diag_find_one_icsk(struct net *net,

				     struct inet_hashinfo *hashinfo,

				     const struct inet_diag_req_v2 *req);



int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);

include/net/inet6_hashtables.h

+6 −12
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static inline unsigned int __inet6_ehashfn(const u32 lhash, 
 * The sockhash lock must be held as a reader here.

 */

struct sock *__inet6_lookup_established(const struct net *net,

					struct inet_hashinfo *hashinfo,

					const struct in6_addr *saddr,

					const __be16 sport,

					const struct in6_addr *daddr,
@@ -65,7 +64,6 @@ struct sock *inet6_lookup_reuseport(const struct net *net, struct sock *sk, 
				    inet6_ehashfn_t *ehashfn);



struct sock *inet6_lookup_listener(const struct net *net,

				   struct inet_hashinfo *hashinfo,

				   struct sk_buff *skb, int doff,

				   const struct in6_addr *saddr,

				   const __be16 sport,
@@ -83,7 +81,6 @@ struct sock *inet6_lookup_run_sk_lookup(const struct net *net, 
					inet6_ehashfn_t *ehashfn);



static inline struct sock *__inet6_lookup(const struct net *net,

					  struct inet_hashinfo *hashinfo,

					  struct sk_buff *skb, int doff,

					  const struct in6_addr *saddr,

					  const __be16 sport,
@@ -92,14 +89,14 @@ static inline struct sock *__inet6_lookup(const struct net *net, 
					  const int dif, const int sdif,

					  bool *refcounted)

{

	struct sock *sk = __inet6_lookup_established(net, hashinfo, saddr,

						     sport, daddr, hnum,

	struct sock *sk = __inet6_lookup_established(net, saddr, sport,

						     daddr, hnum,

						     dif, sdif);

	*refcounted = true;

	if (sk)

		return sk;

	*refcounted = false;

	return inet6_lookup_listener(net, hashinfo, skb, doff, saddr, sport,

	return inet6_lookup_listener(net, skb, doff, saddr, sport,

				     daddr, hnum, dif, sdif);

}
@@ -143,8 +140,7 @@ struct sock *inet6_steal_sock(struct net *net, struct sk_buff *skb, int doff, 
	return reuse_sk;

}



static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,

					      struct sk_buff *skb, int doff,

static inline struct sock *__inet6_lookup_skb(struct sk_buff *skb, int doff,

					      const __be16 sport,

					      const __be16 dport,

					      int iif, int sdif,
@@ -161,14 +157,12 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo, 
	if (sk)

		return sk;



	return __inet6_lookup(net, hashinfo, skb,

			      doff, &ip6h->saddr, sport,

	return __inet6_lookup(net, skb, doff, &ip6h->saddr, sport,

			      &ip6h->daddr, ntohs(dport),

			      iif, sdif, refcounted);

}



struct sock *inet6_lookup(const struct net *net, struct inet_hashinfo *hashinfo,

			  struct sk_buff *skb, int doff,

struct sock *inet6_lookup(const struct net *net, struct sk_buff *skb, int doff,

			  const struct in6_addr *saddr, const __be16 sport,

			  const struct in6_addr *daddr, const __be16 dport,

			  const int dif);

include/net/inet_hashtables.h

+15 −22
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ int inet_hash(struct sock *sk); 
void inet_unhash(struct sock *sk);



struct sock *__inet_lookup_listener(const struct net *net,

				    struct inet_hashinfo *hashinfo,

				    struct sk_buff *skb, int doff,

				    const __be32 saddr, const __be16 sport,

				    const __be32 daddr,
@@ -302,12 +301,12 @@ struct sock *__inet_lookup_listener(const struct net *net, 
				    const int dif, const int sdif);



static inline struct sock *inet_lookup_listener(struct net *net,

		struct inet_hashinfo *hashinfo,

						struct sk_buff *skb, int doff,

						__be32 saddr, __be16 sport,

		__be32 daddr, __be16 dport, int dif, int sdif)

						__be32 daddr, __be16 dport,

						int dif, int sdif)

{

	return __inet_lookup_listener(net, hashinfo, skb, doff, saddr, sport,

	return __inet_lookup_listener(net, skb, doff, saddr, sport,

				      daddr, ntohs(dport), dif, sdif);

}
@@ -358,7 +357,6 @@ static inline bool inet_match(const struct net *net, const struct sock *sk, 
 * not check it for lookups anymore, thanks Alexey. -DaveM

 */

struct sock *__inet_lookup_established(const struct net *net,

				       struct inet_hashinfo *hashinfo,

				       const __be32 saddr, const __be16 sport,

				       const __be32 daddr, const u16 hnum,

				       const int dif, const int sdif);
@@ -384,18 +382,16 @@ struct sock *inet_lookup_run_sk_lookup(const struct net *net, 
				       __be32 daddr, u16 hnum, const int dif,

				       inet_ehashfn_t *ehashfn);



static inline struct sock *

	inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo,

static inline struct sock *inet_lookup_established(struct net *net,

						   const __be32 saddr, const __be16 sport,

						   const __be32 daddr, const __be16 dport,

						   const int dif)

{

	return __inet_lookup_established(net, hashinfo, saddr, sport, daddr,

	return __inet_lookup_established(net, saddr, sport, daddr,

					 ntohs(dport), dif, 0);

}



static inline struct sock *__inet_lookup(struct net *net,

					 struct inet_hashinfo *hashinfo,

					 struct sk_buff *skb, int doff,

					 const __be32 saddr, const __be16 sport,

					 const __be32 daddr, const __be16 dport,
@@ -405,18 +401,17 @@ static inline struct sock *__inet_lookup(struct net *net, 
	u16 hnum = ntohs(dport);

	struct sock *sk;



	sk = __inet_lookup_established(net, hashinfo, saddr, sport,

	sk = __inet_lookup_established(net, saddr, sport,

				       daddr, hnum, dif, sdif);

	*refcounted = true;

	if (sk)

		return sk;

	*refcounted = false;

	return __inet_lookup_listener(net, hashinfo, skb, doff, saddr,

	return __inet_lookup_listener(net, skb, doff, saddr,

				      sport, daddr, hnum, dif, sdif);

}



static inline struct sock *inet_lookup(struct net *net,

				       struct inet_hashinfo *hashinfo,

				       struct sk_buff *skb, int doff,

				       const __be32 saddr, const __be16 sport,

				       const __be32 daddr, const __be16 dport,
@@ -425,7 +420,7 @@ static inline struct sock *inet_lookup(struct net *net, 
	struct sock *sk;

	bool refcounted;



	sk = __inet_lookup(net, hashinfo, skb, doff, saddr, sport, daddr,

	sk = __inet_lookup(net, skb, doff, saddr, sport, daddr,

			   dport, dif, 0, &refcounted);



	if (sk && !refcounted && !refcount_inc_not_zero(&sk->sk_refcnt))
@@ -473,8 +468,7 @@ struct sock *inet_steal_sock(struct net *net, struct sk_buff *skb, int doff, 
	return reuse_sk;

}



static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,

					     struct sk_buff *skb,

static inline struct sock *__inet_lookup_skb(struct sk_buff *skb,

					     int doff,

					     const __be16 sport,

					     const __be16 dport,
@@ -492,8 +486,7 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo, 
	if (sk)

		return sk;



	return __inet_lookup(net, hashinfo, skb,

			     doff, iph->saddr, sport,

	return __inet_lookup(net, skb, doff, iph->saddr, sport,

			     iph->daddr, dport, inet_iif(skb), sdif,

			     refcounted);

}