Skip to contentSkip to conversation

net: Retire DCCP.

PATCH Superseded Kuniyuki Iwashima 6 participants 13 messages Apr 7, 2025 – Apr 8, 2025

Subsystems (27)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover net: Retire DCCP.

As announced by commit b144fcaf46d4 ("dccp: Print deprecation notice."), it's time to remove DCCP.

The patch 2 removes net/dccp, netfilter/LSM code, doc, and etc, leaving the uAPI headers alone.

The patch 3 unexports shared functions for DCCP, and the patch 4 renames tcp_or_dccp_get_hashinfo() to tcp_get_hashinfo().

We can do more cleanup; for example, remove IPPROTO_TCP checks in __inet6?_check_established(), remove __module_get() for twsk, remove timewait_sock_ops.twsk_destructor(), etc, but it will be more of TCP stuff, so I'll defer to a later series.

Kuniyuki Iwashima (4):
selftest: net: Remove DCCP bits.
net: Retire DCCP.
net: Unexport shared functions for DCCP.
tcp: Rename tcp_or_dccp_get_hashinfo().

 Documentation/admin-guide/bug-hunting.rst     |    2 +-
 Documentation/netlink/specs/conntrack.yaml    |   22 -
 Documentation/networking/dccp.rst             |  219 ---
 Documentation/networking/index.rst            |    1 -
 Documentation/networking/ip-sysctl.rst        |    4 +-
 .../networking/nf_conntrack-sysctl.rst        |    1 -
 .../zh_CN/admin-guide/bug-hunting.rst         |    2 +-
 .../zh_TW/admin-guide/bug-hunting.rst         |    2 +-
 MAINTAINERS                                   |    9 -
 arch/arm/configs/omap2plus_defconfig          |    1 -
 arch/loongarch/configs/loongson3_defconfig    |    1 -
 arch/m68k/configs/amiga_defconfig             |    3 -
 arch/m68k/configs/apollo_defconfig            |    3 -
 arch/m68k/configs/atari_defconfig             |    3 -
 arch/m68k/configs/bvme6000_defconfig          |    3 -
 arch/m68k/configs/hp300_defconfig             |    3 -
 arch/m68k/configs/mac_defconfig               |    3 -
 arch/m68k/configs/multi_defconfig             |    3 -
 arch/m68k/configs/mvme147_defconfig           |    3 -
 arch/m68k/configs/mvme16x_defconfig           |    3 -
 arch/m68k/configs/q40_defconfig               |    3 -
 arch/m68k/configs/sun3_defconfig              |    3 -
 arch/m68k/configs/sun3x_defconfig             |    3 -
 arch/mips/configs/bigsur_defconfig            |    1 -
 arch/mips/configs/fuloong2e_defconfig         |    1 -
 arch/mips/configs/gpr_defconfig               |    1 -
 arch/mips/configs/ip22_defconfig              |    1 -
 arch/mips/configs/loongson2k_defconfig        |    1 -
 arch/mips/configs/loongson3_defconfig         |    1 -
 arch/mips/configs/malta_defconfig             |    1 -
 arch/mips/configs/malta_kvm_defconfig         |    1 -
 arch/mips/configs/maltaup_xpa_defconfig       |    1 -
 arch/mips/configs/mtx1_defconfig              |    1 -
 arch/mips/configs/rb532_defconfig             |    1 -
 arch/mips/configs/rm200_defconfig             |    1 -
 arch/powerpc/configs/cell_defconfig           |    1 -
 arch/powerpc/configs/pmac32_defconfig         |    1 -
 arch/powerpc/configs/ppc6xx_defconfig         |    1 -
 arch/s390/configs/debug_defconfig             |    1 -
 arch/s390/configs/defconfig                   |    1 -
 arch/sh/configs/titan_defconfig               |    1 -
 include/linux/dccp.h                          |  324 ----
 include/linux/in.h                            |    1 -
 include/linux/netfilter/nf_conntrack_dccp.h   |   38 -
 include/linux/tfrc.h                          |   51 -
 include/net/inet_hashtables.h                 |    7 +-
 .../net/netfilter/ipv4/nf_conntrack_ipv4.h    |    3 -
 include/net/netfilter/nf_conntrack.h          |    2 -
 include/net/netfilter/nf_conntrack_l4proto.h  |   13 -
 include/net/netfilter/nf_conntrack_tuple.h    |    3 -
 include/net/netfilter/nf_reject.h             |    1 -
 include/net/netns/conntrack.h                 |   13 -
 include/net/rstreason.h                       |    2 +-
 include/net/secure_seq.h                      |    4 -
 include/net/sock.h                            |    1 -
 include/trace/events/sock.h                   |    1 -
 include/trace/events/sunrpc.h                 |    2 -
 net/Kconfig                                   |    1 -
 net/Makefile                                  |    1 -
 net/bridge/netfilter/ebt_ip.c                 |    3 +-
 net/bridge/netfilter/ebt_ip6.c                |    3 +-
 net/bridge/netfilter/ebt_log.c                |    3 +-
 net/core/flow_dissector.c                     |    4 -
 net/core/secure_seq.c                         |   42 -
 net/core/sock.c                               |   24 +-
 net/core/sock_diag.c                          |    2 -
 net/dccp/Kconfig                              |   46 -
 net/dccp/Makefile                             |   30 -
 net/dccp/ackvec.c                             |  403 -----
 net/dccp/ackvec.h                             |  136 --
 net/dccp/ccid.c                               |  219 ---
 net/dccp/ccid.h                               |  262 ---
 net/dccp/ccids/Kconfig                        |   55 -
 net/dccp/ccids/ccid2.c                        |  794 ---------
 net/dccp/ccids/ccid2.h                        |  121 --
 net/dccp/ccids/ccid3.c                        |  866 ---------
 net/dccp/ccids/ccid3.h                        |  148 --
 net/dccp/ccids/lib/loss_interval.c            |  184 --
 net/dccp/ccids/lib/loss_interval.h            |   69 -
 net/dccp/ccids/lib/packet_history.c           |  439 -----
 net/dccp/ccids/lib/packet_history.h           |  142 --
 net/dccp/ccids/lib/tfrc.c                     |   46 -
 net/dccp/ccids/lib/tfrc.h                     |   73 -
 net/dccp/ccids/lib/tfrc_equation.c            |  702 --------
 net/dccp/dccp.h                               |  483 -----
 net/dccp/diag.c                               |   85 -
 net/dccp/feat.c                               | 1581 -----------------
 net/dccp/feat.h                               |  133 --
 net/dccp/input.c                              |  739 --------
 net/dccp/ipv4.c                               | 1101 ------------
 net/dccp/ipv6.c                               | 1174 ------------
 net/dccp/ipv6.h                               |   27 -
 net/dccp/minisocks.c                          |  266 ---
 net/dccp/options.c                            |  609 -------
 net/dccp/output.c                             |  708 --------
 net/dccp/proto.c                              | 1293 --------------
 net/dccp/qpolicy.c                            |  136 --
 net/dccp/sysctl.c                             |  107 --
 net/dccp/timer.c                              |  272 ---
 net/dccp/trace.h                              |   82 -
 net/ipv4/Kconfig                              |    2 +-
 net/ipv4/af_inet.c                            |    5 +-
 net/ipv4/inet_connection_sock.c               |   23 +-
 net/ipv4/inet_diag.c                          |    2 -
 net/ipv4/inet_hashtables.c                    |   30 +-
 net/ipv4/inet_timewait_sock.c                 |    6 +-
 net/ipv6/af_inet6.c                           |    1 -
 net/ipv6/inet6_connection_sock.c              |    2 -
 net/ipv6/ip6_output.c                         |    2 +-
 net/netfilter/Kconfig                         |   22 -
 net/netfilter/Makefile                        |    2 -
 net/netfilter/nf_conntrack_core.c             |   10 +-
 net/netfilter/nf_conntrack_netlink.c          |    1 -
 net/netfilter/nf_conntrack_proto.c            |    6 -
 net/netfilter/nf_conntrack_proto_dccp.c       |  826 ---------
 net/netfilter/nf_conntrack_standalone.c       |   92 -
 net/netfilter/nf_nat_core.c                   |    6 -
 net/netfilter/nf_nat_proto.c                  |   44 -
 net/netfilter/nfnetlink_cttimeout.c           |    5 -
 net/netfilter/nft_ct.c                        |    1 -
 net/netfilter/nft_exthdr.c                    |  106 --
 net/netfilter/xt_dccp.c                       |  185 --
 net/netfilter/xt_multiport.c                  |    6 +-
 samples/bpf/sockex2_kern.c                    |    1 -
 scripts/checkpatch.pl                         |    2 +-
 security/lsm_audit.c                          |   19 -
 security/selinux/hooks.c                      |   41 +-
 security/selinux/include/classmap.h           |    2 -
 security/selinux/nlmsgtab.c                   |    1 -
 security/smack/smack_lsm.c                    |    9 +-
 tools/testing/selftests/net/config            |    1 -
 .../selftests/net/reuseport_addr_any.c        |   36 +-
 132 files changed, 49 insertions(+), 15846 deletions(-)
 delete mode 100644 Documentation/networking/dccp.rst
 delete mode 100644 include/linux/dccp.h
 delete mode 100644 include/linux/netfilter/nf_conntrack_dccp.h
 delete mode 100644 include/linux/tfrc.h
 delete mode 100644 net/dccp/Kconfig
 delete mode 100644 net/dccp/Makefile
 delete mode 100644 net/dccp/ackvec.c
 delete mode 100644 net/dccp/ackvec.h
 delete mode 100644 net/dccp/ccid.c
 delete mode 100644 net/dccp/ccid.h
 delete mode 100644 net/dccp/ccids/Kconfig
 delete mode 100644 net/dccp/ccids/ccid2.c
 delete mode 100644 net/dccp/ccids/ccid2.h
 delete mode 100644 net/dccp/ccids/ccid3.c
 delete mode 100644 net/dccp/ccids/ccid3.h
 delete mode 100644 net/dccp/ccids/lib/loss_interval.c
 delete mode 100644 net/dccp/ccids/lib/loss_interval.h
 delete mode 100644 net/dccp/ccids/lib/packet_history.c
 delete mode 100644 net/dccp/ccids/lib/packet_history.h
 delete mode 100644 net/dccp/ccids/lib/tfrc.c
 delete mode 100644 net/dccp/ccids/lib/tfrc.h
 delete mode 100644 net/dccp/ccids/lib/tfrc_equation.c
 delete mode 100644 net/dccp/dccp.h
 delete mode 100644 net/dccp/diag.c
 delete mode 100644 net/dccp/feat.c
 delete mode 100644 net/dccp/feat.h
 delete mode 100644 net/dccp/input.c
 delete mode 100644 net/dccp/ipv4.c
 delete mode 100644 net/dccp/ipv6.c
 delete mode 100644 net/dccp/ipv6.h
 delete mode 100644 net/dccp/minisocks.c
 delete mode 100644 net/dccp/options.c
 delete mode 100644 net/dccp/output.c
 delete mode 100644 net/dccp/proto.c
 delete mode 100644 net/dccp/qpolicy.c
 delete mode 100644 net/dccp/sysctl.c
 delete mode 100644 net/dccp/timer.c
 delete mode 100644 net/dccp/trace.h
 delete mode 100644 net/netfilter/nf_conntrack_proto_dccp.c
 delete mode 100644 net/netfilter/xt_dccp.c
Signature · 1 line
2.48.1
#1 lore raw

PATCH 1/4 selftest: net: Remove DCCP bits.

We will remove DCCP.

Let's remove DCCP bits from selftest.

---
 tools/testing/selftests/net/config            |  1 -
 .../selftests/net/reuseport_addr_any.c        | 36 +------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
tools/testing/selftests/net/config +0 -1
index 130d532b7e67..3cfef5153823 100644
@@ -33,7 +33,6 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_SIT=y
-CONFIG_IP_DCCP=m
 CONFIG_NF_NAT=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP_NF_IPTABLES=m
tools/testing/selftests/net/reuseport_addr_any.c +1 -35
index b8475cb29be7..1c43401a1c80 100644
@@ -9,7 +9,6 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <error.h>
-#include <linux/dccp.h>
 #include <linux/in.h>
 #include <linux/unistd.h>
 #include <stdbool.h>
@@ -21,10 +20,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#ifndef SOL_DCCP
-#define SOL_DCCP 269
-#endif
-
 static const char *IP4_ADDR = "127.0.0.1";
 static const char *IP6_ADDR = "::1";
 static const char *IP4_MAPPED6 = "::ffff:127.0.0.1";
@@ -86,15 +81,6 @@ static void build_rcv_fd(int family, int proto, int *rcv_fds, int count,
 
 		if (proto == SOCK_STREAM && listen(rcv_fds[i], 10))
 			error(1, errno, "tcp: failed to listen on receive port");
-		else if (proto == SOCK_DCCP) {
-			if (setsockopt(rcv_fds[i], SOL_DCCP,
-					DCCP_SOCKOPT_SERVICE,
-					&(int) {htonl(42)}, sizeof(int)))
-				error(1, errno, "failed to setsockopt");
-
-			if (listen(rcv_fds[i], 10))
-				error(1, errno, "dccp: failed to listen on receive port");
-		}
 	}
 }
 
@@ -148,11 +134,6 @@ static int connect_and_send(int family, int proto)
 	if (fd < 0)
 		error(1, errno, "failed to create send socket");
 
-	if (proto == SOCK_DCCP &&
-		setsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE,
-				&(int){htonl(42)}, sizeof(int)))
-		error(1, errno, "failed to setsockopt");
-
 	if (bind(fd, saddr, sz))
 		error(1, errno, "failed to bind send socket");
 
@@ -175,7 +156,7 @@ static int receive_once(int epfd, int proto)
 	if (i < 0)
 		error(1, errno, "epoll_wait failed");
 
-	if (proto == SOCK_STREAM || proto == SOCK_DCCP) {
+	if (proto == SOCK_STREAM) {
 		fd = accept(ev.data.fd, NULL, NULL);
 		if (fd < 0)
 			error(1, errno, "failed to accept");
@@ -243,20 +224,6 @@ static void run_one_test(int fam_send, int fam_rcv, int proto,
 
 static void test_proto(int proto, const char *proto_str)
 {
-	if (proto == SOCK_DCCP) {
-		int test_fd;
-
-		test_fd = socket(AF_INET, proto, 0);
-		if (test_fd < 0) {
-			if (errno == ESOCKTNOSUPPORT) {
-				fprintf(stderr, "DCCP not supported: skipping DCCP tests\n");
-				return;
-			} else
-				error(1, errno, "failed to create a DCCP socket");
-		}
-		close(test_fd);
-	}
-
 	fprintf(stderr, "%s IPv4 ... ", proto_str);
 	run_one_test(AF_INET, AF_INET, proto, IP4_ADDR);
 
@@ -271,7 +238,6 @@ int main(void)
 {
 	test_proto(SOCK_DGRAM, "UDP");
 	test_proto(SOCK_STREAM, "TCP");
-	test_proto(SOCK_DCCP, "DCCP");
 
 	fprintf(stderr, "SUCCESS\n");
 	return 0;
Signature · 1 line
2.48.1
#2 lore raw

PATCH 2/4 net: Retire DCCP.

In reply to Kuniyuki Iwashima

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot. Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP. The repository is hosted on GitHub [1], and development is not taking place through the upstream community. While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

"This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP. It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Note that we leave uAPI headers alone for userspace programs.

---
 Documentation/admin-guide/bug-hunting.rst     |    2 +-
 Documentation/netlink/specs/conntrack.yaml    |   22 -
 Documentation/networking/dccp.rst             |  219 ---
 Documentation/networking/index.rst            |    1 -
 Documentation/networking/ip-sysctl.rst        |    4 +-
 .../networking/nf_conntrack-sysctl.rst        |    1 -
 .../zh_CN/admin-guide/bug-hunting.rst         |    2 +-
 .../zh_TW/admin-guide/bug-hunting.rst         |    2 +-
 MAINTAINERS                                   |    9 -
 arch/arm/configs/omap2plus_defconfig          |    1 -
 arch/loongarch/configs/loongson3_defconfig    |    1 -
 arch/m68k/configs/amiga_defconfig             |    3 -
 arch/m68k/configs/apollo_defconfig            |    3 -
 arch/m68k/configs/atari_defconfig             |    3 -
 arch/m68k/configs/bvme6000_defconfig          |    3 -
 arch/m68k/configs/hp300_defconfig             |    3 -
 arch/m68k/configs/mac_defconfig               |    3 -
 arch/m68k/configs/multi_defconfig             |    3 -
 arch/m68k/configs/mvme147_defconfig           |    3 -
 arch/m68k/configs/mvme16x_defconfig           |    3 -
 arch/m68k/configs/q40_defconfig               |    3 -
 arch/m68k/configs/sun3_defconfig              |    3 -
 arch/m68k/configs/sun3x_defconfig             |    3 -
 arch/mips/configs/bigsur_defconfig            |    1 -
 arch/mips/configs/fuloong2e_defconfig         |    1 -
 arch/mips/configs/gpr_defconfig               |    1 -
 arch/mips/configs/ip22_defconfig              |    1 -
 arch/mips/configs/loongson2k_defconfig        |    1 -
 arch/mips/configs/loongson3_defconfig         |    1 -
 arch/mips/configs/malta_defconfig             |    1 -
 arch/mips/configs/malta_kvm_defconfig         |    1 -
 arch/mips/configs/maltaup_xpa_defconfig       |    1 -
 arch/mips/configs/mtx1_defconfig              |    1 -
 arch/mips/configs/rb532_defconfig             |    1 -
 arch/mips/configs/rm200_defconfig             |    1 -
 arch/powerpc/configs/cell_defconfig           |    1 -
 arch/powerpc/configs/pmac32_defconfig         |    1 -
 arch/powerpc/configs/ppc6xx_defconfig         |    1 -
 arch/s390/configs/debug_defconfig             |    1 -
 arch/s390/configs/defconfig                   |    1 -
 arch/sh/configs/titan_defconfig               |    1 -
 include/linux/dccp.h                          |  324 ----
 include/linux/in.h                            |    1 -
 include/linux/netfilter/nf_conntrack_dccp.h   |   38 -
 include/linux/tfrc.h                          |   51 -
 include/net/inet_hashtables.h                 |    6 +-
 .../net/netfilter/ipv4/nf_conntrack_ipv4.h    |    3 -
 include/net/netfilter/nf_conntrack.h          |    2 -
 include/net/netfilter/nf_conntrack_l4proto.h  |   13 -
 include/net/netfilter/nf_conntrack_tuple.h    |    3 -
 include/net/netfilter/nf_reject.h             |    1 -
 include/net/netns/conntrack.h                 |   13 -
 include/net/rstreason.h                       |    2 +-
 include/net/secure_seq.h                      |    4 -
 include/trace/events/sock.h                   |    1 -
 include/trace/events/sunrpc.h                 |    2 -
 net/Kconfig                                   |    1 -
 net/Makefile                                  |    1 -
 net/bridge/netfilter/ebt_ip.c                 |    3 +-
 net/bridge/netfilter/ebt_ip6.c                |    3 +-
 net/bridge/netfilter/ebt_log.c                |    3 +-
 net/core/flow_dissector.c                     |    4 -
 net/core/secure_seq.c                         |   42 -
 net/core/sock_diag.c                          |    2 -
 net/dccp/Kconfig                              |   46 -
 net/dccp/Makefile                             |   30 -
 net/dccp/ackvec.c                             |  403 -----
 net/dccp/ackvec.h                             |  136 --
 net/dccp/ccid.c                               |  219 ---
 net/dccp/ccid.h                               |  262 ---
 net/dccp/ccids/Kconfig                        |   55 -
 net/dccp/ccids/ccid2.c                        |  794 ---------
 net/dccp/ccids/ccid2.h                        |  121 --
 net/dccp/ccids/ccid3.c                        |  866 ---------
 net/dccp/ccids/ccid3.h                        |  148 --
 net/dccp/ccids/lib/loss_interval.c            |  184 --
 net/dccp/ccids/lib/loss_interval.h            |   69 -
 net/dccp/ccids/lib/packet_history.c           |  439 -----
 net/dccp/ccids/lib/packet_history.h           |  142 --
 net/dccp/ccids/lib/tfrc.c                     |   46 -
 net/dccp/ccids/lib/tfrc.h                     |   73 -
 net/dccp/ccids/lib/tfrc_equation.c            |  702 --------
 net/dccp/dccp.h                               |  483 -----
 net/dccp/diag.c                               |   85 -
 net/dccp/feat.c                               | 1581 -----------------
 net/dccp/feat.h                               |  133 --
 net/dccp/input.c                              |  739 --------
 net/dccp/ipv4.c                               | 1101 ------------
 net/dccp/ipv6.c                               | 1174 ------------
 net/dccp/ipv6.h                               |   27 -
 net/dccp/minisocks.c                          |  266 ---
 net/dccp/options.c                            |  609 -------
 net/dccp/output.c                             |  708 --------
 net/dccp/proto.c                              | 1293 --------------
 net/dccp/qpolicy.c                            |  136 --
 net/dccp/sysctl.c                             |  107 --
 net/dccp/timer.c                              |  272 ---
 net/dccp/trace.h                              |   82 -
 net/ipv4/Kconfig                              |    2 +-
 net/ipv4/af_inet.c                            |    5 +-
 net/ipv4/inet_connection_sock.c               |    2 +-
 net/ipv4/inet_diag.c                          |    2 -
 net/ipv6/ip6_output.c                         |    2 +-
 net/netfilter/Kconfig                         |   22 -
 net/netfilter/Makefile                        |    2 -
 net/netfilter/nf_conntrack_core.c             |   10 +-
 net/netfilter/nf_conntrack_netlink.c          |    1 -
 net/netfilter/nf_conntrack_proto.c            |    6 -
 net/netfilter/nf_conntrack_proto_dccp.c       |  826 ---------
 net/netfilter/nf_conntrack_standalone.c       |   92 -
 net/netfilter/nf_nat_core.c                   |    6 -
 net/netfilter/nf_nat_proto.c                  |   44 -
 net/netfilter/nfnetlink_cttimeout.c           |    5 -
 net/netfilter/nft_ct.c                        |    1 -
 net/netfilter/nft_exthdr.c                    |  106 --
 net/netfilter/xt_dccp.c                       |  185 --
 net/netfilter/xt_multiport.c                  |    6 +-
 samples/bpf/sockex2_kern.c                    |    1 -
 scripts/checkpatch.pl                         |    2 +-
 security/lsm_audit.c                          |   19 -
 security/selinux/hooks.c                      |   41 +-
 security/selinux/include/classmap.h           |    2 -
 security/selinux/nlmsgtab.c                   |    1 -
 security/smack/smack_lsm.c                    |    9 +-
 124 files changed, 21 insertions(+), 15751 deletions(-)
 delete mode 100644 Documentation/networking/dccp.rst
 delete mode 100644 include/linux/dccp.h
 delete mode 100644 include/linux/netfilter/nf_conntrack_dccp.h
 delete mode 100644 include/linux/tfrc.h
 delete mode 100644 net/dccp/Kconfig
 delete mode 100644 net/dccp/Makefile
 delete mode 100644 net/dccp/ackvec.c
 delete mode 100644 net/dccp/ackvec.h
 delete mode 100644 net/dccp/ccid.c
 delete mode 100644 net/dccp/ccid.h
 delete mode 100644 net/dccp/ccids/Kconfig
 delete mode 100644 net/dccp/ccids/ccid2.c
 delete mode 100644 net/dccp/ccids/ccid2.h
 delete mode 100644 net/dccp/ccids/ccid3.c
 delete mode 100644 net/dccp/ccids/ccid3.h
 delete mode 100644 net/dccp/ccids/lib/loss_interval.c
 delete mode 100644 net/dccp/ccids/lib/loss_interval.h
 delete mode 100644 net/dccp/ccids/lib/packet_history.c
 delete mode 100644 net/dccp/ccids/lib/packet_history.h
 delete mode 100644 net/dccp/ccids/lib/tfrc.c
 delete mode 100644 net/dccp/ccids/lib/tfrc.h
 delete mode 100644 net/dccp/ccids/lib/tfrc_equation.c
 delete mode 100644 net/dccp/dccp.h
 delete mode 100644 net/dccp/diag.c
 delete mode 100644 net/dccp/feat.c
 delete mode 100644 net/dccp/feat.h
 delete mode 100644 net/dccp/input.c
 delete mode 100644 net/dccp/ipv4.c
 delete mode 100644 net/dccp/ipv6.c
 delete mode 100644 net/dccp/ipv6.h
 delete mode 100644 net/dccp/minisocks.c
 delete mode 100644 net/dccp/options.c
 delete mode 100644 net/dccp/output.c
 delete mode 100644 net/dccp/proto.c
 delete mode 100644 net/dccp/qpolicy.c
 delete mode 100644 net/dccp/sysctl.c
 delete mode 100644 net/dccp/timer.c
 delete mode 100644 net/dccp/trace.h
 delete mode 100644 net/netfilter/nf_conntrack_proto_dccp.c
 delete mode 100644 net/netfilter/xt_dccp.c
Documentation/admin-guide/bug-hunting.rst +1 -1
index ce6f4e8ca487..30858757c9f2 100644
@@ -196,7 +196,7 @@ will see the assembler code for the routine shown, but if your kernel has
 debug symbols the C code will also be available. (Debug symbols can be enabled
 in the kernel hacking menu of the menu configuration.) For example::
 
-    $ objdump -r -S -l --disassemble net/dccp/ipv4.o
+    $ objdump -r -S -l --disassemble net/ipv4/tcp.o
 
 .. note::
 
Documentation/netlink/specs/conntrack.yaml +0 -22
index 840dc4504216..74f886c3d111 100644
@@ -234,23 +234,6 @@ attribute-sets:
         name: tcp-flags-reply
         type: binary
         struct: nf-ct-tcp-flags-mask
-  -
-    name: protoinfo-dccp-attrs
-    attributes:
-    -
-        name: dccp-state
-        type: u8
-        doc: dccp connection state
-    -
-        name: dccp-role
-        type: u8
-    -
-        name: dccp-handshake-seq
-        type: u64
-        byte-order: big-endian
-    -
-        name: dccp-pad
-        type: pad
   -
     name: protoinfo-sctp-attrs
     attributes:
@@ -275,11 +258,6 @@ attribute-sets:
         type: nest
         nested-attributes: protoinfo-tcp-attrs
         doc: conntrack tcp state information
-    -
-        name: protoinfo-dccp
-        type: nest
-        nested-attributes: protoinfo-dccp-attrs
-        doc: conntrack dccp state information
     -
         name: protoinfo-sctp
         type: nest
Documentation/networking/dccp.rst deleted +0 -219

219 lines not on this page · raw message

Documentation/networking/index.rst +0 -1
index c64133d309bf..ac90b82f3ce9 100644
@@ -48,7 +48,6 @@ Contents:
    ax25
    bonding
    cdc_mbim
-   dccp
    dctcp
    devmem
    dns_resolver
Documentation/networking/ip-sysctl.rst +2 -2
index 5c63ab928b97..b43222ee57cf 100644
@@ -37,8 +37,8 @@ ip_no_pmtu_disc - INTEGER
 	Mode 3 is a hardened pmtu discover mode. The kernel will only
 	accept fragmentation-needed errors if the underlying protocol
 	can verify them besides a plain socket lookup. Current
-	protocols for which pmtu events will be honored are TCP, SCTP
-	and DCCP as they verify e.g. the sequence number or the
+	protocols for which pmtu events will be honored are TCP and
+	SCTP as they verify e.g. the sequence number or the
 	association. This mode should not be enabled globally but is
 	only intended to secure e.g. name servers in namespaces where
 	TCP path mtu must still work but path MTU information of other
Documentation/networking/nf_conntrack-sysctl.rst +0 -1
index 238b66d0e059..35f889259fcd 100644
@@ -85,7 +85,6 @@ nf_conntrack_log_invalid - INTEGER
 	- 1   - log ICMP packets
 	- 6   - log TCP packets
 	- 17  - log UDP packets
-	- 33  - log DCCP packets
 	- 41  - log ICMPv6 packets
 	- 136 - log UDPLITE packets
 	- 255 - log packets of any protocol
Documentation/translations/zh_CN/admin-guide/bug-hunting.rst +1 -1
index c3f6a83294dc..4b3432753eb9 100644
@@ -188,7 +188,7 @@ objdump
 编行。如果没有调试符号,您将看到所示例程的汇编程序代码,但是如果内核有调试
 符号,C代码也将可见(调试符号可以在内核配置菜单的hacking项中启用)。例如::
 
-    $ objdump -r -S -l --disassemble net/dccp/ipv4.o
+    $ objdump -r -S -l --disassemble net/ipv4/tcp.o
 
 .. note::
 
Documentation/translations/zh_TW/admin-guide/bug-hunting.rst +1 -1
index b25ecc44d735..80ea5677ee52 100644
@@ -191,7 +191,7 @@ objdump
 編行。如果沒有調試符號,您將看到所示例程的彙編程序代碼,但是如果內核有調試
 符號,C代碼也將可見(調試符號可以在內核配置菜單的hacking項中啓用)。例如::
 
-    $ objdump -r -S -l --disassemble net/dccp/ipv4.o
+    $ objdump -r -S -l --disassemble net/ipv4/tcp.o
 
 .. note::
 
MAINTAINERS +0 -9
index 4c5c2e2c1278..1e8cae8db904 100644
@@ -6544,15 +6544,6 @@ S:	Maintained
 F:	Documentation/scsi/dc395x.rst
 F:	drivers/scsi/dc395x.*
 
-DCCP PROTOCOL
-L:	[email protected]
-S:	Orphan
-W:	http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
-F:	include/linux/dccp.h
-F:	include/linux/tfrc.h
-F:	include/uapi/linux/dccp.h
-F:	net/dccp/
-
 DEBUGOBJECTS:
 M:	Thomas Gleixner <[email protected]>
 L:	[email protected]
arch/arm/configs/omap2plus_defconfig +0 -1
index 113d6dfe5243..07d4da08e575 100644
@@ -142,7 +142,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/loongarch/configs/loongson3_defconfig +0 -1
index 90f21dfe22b1..0c6688a0d8a9 100644
@@ -225,7 +225,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/m68k/configs/amiga_defconfig +0 -3
index 31ecb8b7b9f1..7bf264605fe8 100644
@@ -85,7 +85,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -267,8 +266,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/apollo_defconfig +0 -3
index 1f57514624d5..8d2f0145f347 100644
@@ -81,7 +81,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -263,8 +262,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/atari_defconfig +0 -3
index 02db7a48e57e..9c4899cf1063 100644
@@ -88,7 +88,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -270,8 +269,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/bvme6000_defconfig +0 -3
index f0e673cb17eb..0f8e3c9c49ea 100644
@@ -78,7 +78,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -260,8 +259,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/hp300_defconfig +0 -3
index e8ca5a50b86d..b3f975841b2f 100644
@@ -80,7 +80,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -262,8 +261,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/mac_defconfig +0 -3
index b3a270441bb1..58a590f4a11c 100644
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -261,8 +260,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/multi_defconfig +0 -3
index d215dba006ce..63aa7fee2462 100644
@@ -99,7 +99,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -281,8 +280,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/mvme147_defconfig +0 -3
index a888ed93ff82..ec6ac131dc58 100644
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -259,8 +258,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/mvme16x_defconfig +0 -3
index b481782375f6..6d7cd83dcc25 100644
@@ -78,7 +78,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -260,8 +259,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/q40_defconfig +0 -3
index 6eba743d8eb5..35a7e05a1768 100644
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -261,8 +260,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/sun3_defconfig +0 -3
index 9bdbb418ffa8..a0ebfd2cb581 100644
@@ -74,7 +74,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -256,8 +255,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/m68k/configs/sun3x_defconfig +0 -3
index e1cf20fa5343..ac2a9ccdb0ac 100644
@@ -75,7 +75,6 @@ CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -257,8 +256,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-# CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
arch/mips/configs/bigsur_defconfig +0 -1
index fe282630b51c..a99eb0017fbd 100644
@@ -81,7 +81,6 @@ CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
-CONFIG_IP_DCCP=m
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
arch/mips/configs/fuloong2e_defconfig +0 -1
index 5ab149cd3178..5ca4678280db 100644
@@ -44,7 +44,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
arch/mips/configs/gpr_defconfig +0 -1
index 12f3eed8a946..df55fe6df8ba 100644
@@ -84,7 +84,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_IP_DCCP=m
 CONFIG_IP_SCTP=m
 CONFIG_TIPC=m
 CONFIG_ATM=y
arch/mips/configs/ip22_defconfig +0 -1
index 31ca93d3acc5..2aad7ba629ae 100644
@@ -79,7 +79,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/mips/configs/loongson2k_defconfig +0 -1
index 4b7f914d01d0..6aea6a5b1b66 100644
@@ -52,7 +52,6 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
arch/mips/configs/loongson3_defconfig +0 -1
index 98844b457b7f..43a72c410538 100644
@@ -72,7 +72,6 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
arch/mips/configs/malta_defconfig +0 -1
index 869a14b3184f..9fcbac829920 100644
@@ -80,7 +80,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/malta_kvm_defconfig +0 -1
index 41e1fea303ea..19102386a81c 100644
@@ -84,7 +84,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/maltaup_xpa_defconfig +0 -1
index 13ff1877e26e..1dd07c9d1812 100644
@@ -82,7 +82,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
arch/mips/configs/mtx1_defconfig +0 -1
index 06b7a0b97eca..487bd84043f7 100644
@@ -130,7 +130,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_IP_DCCP=m
 CONFIG_IP_SCTP=m
 CONFIG_TIPC=m
 CONFIG_ATM=y
arch/mips/configs/rb532_defconfig +0 -1
index 0261969a6e45..9c4b8642e2d7 100644
@@ -56,7 +56,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
arch/mips/configs/rm200_defconfig +0 -1
index 7b5a5591ccc9..39a2419e1f3e 100644
@@ -64,7 +64,6 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/powerpc/configs/cell_defconfig +0 -1
index 3347192b77b8..7a31b52e92e1 100644
@@ -62,7 +62,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
arch/powerpc/configs/pmac32_defconfig +0 -1
index e8b3f67bf3f5..c2165737f960 100644
@@ -87,7 +87,6 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_DCCP=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/powerpc/configs/ppc6xx_defconfig +0 -1
index a91a766b71a4..5e0f2cd7e62b 100644
@@ -225,7 +225,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
 CONFIG_TIPC=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
arch/s390/configs/debug_defconfig +0 -1
index 6f2c9ce1b154..cc45696a2aa3 100644
@@ -250,7 +250,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/s390/configs/defconfig +0 -1
index f18a7d97ac21..fbc4a5036e3b 100644
@@ -241,7 +241,6 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
arch/sh/configs/titan_defconfig +0 -1
index 11ff5fd510de..9a500eecb6bc 100644
@@ -61,7 +61,6 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
include/linux/dccp.h deleted +0 -324

324 lines not on this page · raw message

include/linux/in.h +0 -1
index 1873ef642605..b50b147fc248 100644
@@ -23,7 +23,6 @@ static inline int proto_ports_offset(int proto)
 	switch (proto) {
 	case IPPROTO_TCP:
 	case IPPROTO_UDP:
-	case IPPROTO_DCCP:
 	case IPPROTO_ESP:	/* SPI */
 	case IPPROTO_SCTP:
 	case IPPROTO_UDPLITE:
include/linux/netfilter/nf_conntrack_dccp.h deleted +0 -38
deleted file mode 100644
index c509ed76e714..000000000000
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _NF_CONNTRACK_DCCP_H
-#define _NF_CONNTRACK_DCCP_H
-
-/* Exposed to userspace over nfnetlink */
-enum ct_dccp_states {
-	CT_DCCP_NONE,
-	CT_DCCP_REQUEST,
-	CT_DCCP_RESPOND,
-	CT_DCCP_PARTOPEN,
-	CT_DCCP_OPEN,
-	CT_DCCP_CLOSEREQ,
-	CT_DCCP_CLOSING,
-	CT_DCCP_TIMEWAIT,
-	CT_DCCP_IGNORE,
-	CT_DCCP_INVALID,
-	__CT_DCCP_MAX
-};
-#define CT_DCCP_MAX		(__CT_DCCP_MAX - 1)
-
-enum ct_dccp_roles {
-	CT_DCCP_ROLE_CLIENT,
-	CT_DCCP_ROLE_SERVER,
-	__CT_DCCP_ROLE_MAX
-};
-#define CT_DCCP_ROLE_MAX	(__CT_DCCP_ROLE_MAX - 1)
-
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-
-struct nf_ct_dccp {
-	u_int8_t	role[IP_CT_DIR_MAX];
-	u_int8_t	state;
-	u_int8_t	last_pkt;
-	u_int8_t	last_dir;
-	u_int64_t	handshake_seq;
-};
-
-#endif /* _NF_CONNTRACK_DCCP_H */
include/linux/tfrc.h deleted +0 -51

51 lines not on this page · raw message

include/net/inet_hashtables.h +1 -5
index 949641e92539..d172b64a6320 100644
@@ -177,12 +177,8 @@ struct inet_hashinfo {
 
 static inline struct inet_hashinfo *tcp_or_dccp_get_hashinfo(const struct sock *sk)
 {
-#if IS_ENABLED(CONFIG_IP_DCCP)
-	return sk->sk_prot->h.hashinfo ? :
-		sock_net(sk)->ipv4.tcp_death_row.hashinfo;
-#else
+	/* TODO: rename function */
 	return sock_net(sk)->ipv4.tcp_death_row.hashinfo;
-#endif
 }
 
 static inline struct inet_listen_hashbucket *
include/net/netfilter/ipv4/nf_conntrack_ipv4.h +0 -3
index 2c8c2b023848..8d65ffbf57de 100644
@@ -13,9 +13,6 @@
 extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp;
 extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp;
 extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
-#ifdef CONFIG_NF_CT_PROTO_DCCP
-extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp;
-#endif
 #ifdef CONFIG_NF_CT_PROTO_SCTP
 extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp;
 #endif
include/net/netfilter/nf_conntrack.h +0 -2
index 3f02a45773e8..a844aa46d076 100644
@@ -18,7 +18,6 @@
 
 #include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
-#include <linux/netfilter/nf_conntrack_dccp.h>
 #include <linux/netfilter/nf_conntrack_sctp.h>
 #include <linux/netfilter/nf_conntrack_proto_gre.h>
 
@@ -31,7 +30,6 @@ struct nf_ct_udp {
 /* per conntrack: protocol private data */
 union nf_conntrack_proto {
 	/* insert conntrack proto private data here */
-	struct nf_ct_dccp dccp;
 	struct ip_ct_sctp sctp;
 	struct ip_ct_tcp tcp;
 	struct nf_ct_udp udp;
include/net/netfilter/nf_conntrack_l4proto.h +0 -13
index 1f47bef51722..6929f8daf1ed 100644
@@ -117,11 +117,6 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,
 			    unsigned int dataoff,
 			    enum ip_conntrack_info ctinfo,
 			    const struct nf_hook_state *state);
-int nf_conntrack_dccp_packet(struct nf_conn *ct,
-			     struct sk_buff *skb,
-			     unsigned int dataoff,
-			     enum ip_conntrack_info ctinfo,
-			     const struct nf_hook_state *state);
 int nf_conntrack_sctp_packet(struct nf_conn *ct,
 			     struct sk_buff *skb,
 			     unsigned int dataoff,
@@ -137,7 +132,6 @@ void nf_conntrack_generic_init_net(struct net *net);
 void nf_conntrack_tcp_init_net(struct net *net);
 void nf_conntrack_udp_init_net(struct net *net);
 void nf_conntrack_gre_init_net(struct net *net);
-void nf_conntrack_dccp_init_net(struct net *net);
 void nf_conntrack_sctp_init_net(struct net *net);
 void nf_conntrack_icmp_init_net(struct net *net);
 void nf_conntrack_icmpv6_init_net(struct net *net);
@@ -223,13 +217,6 @@ static inline bool nf_conntrack_tcp_established(const struct nf_conn *ct)
 }
 #endif
 
-#ifdef CONFIG_NF_CT_PROTO_DCCP
-static inline struct nf_dccp_net *nf_dccp_pernet(struct net *net)
-{
-	return &net->ct.nf_ct_proto.dccp;
-}
-#endif
-
 #ifdef CONFIG_NF_CT_PROTO_SCTP
 static inline struct nf_sctp_net *nf_sctp_pernet(struct net *net)
 {
include/net/netfilter/nf_conntrack_tuple.h +0 -3
index f7dd950ff250..1082a6e04676 100644
@@ -53,9 +53,6 @@ struct nf_conntrack_tuple {
 			struct {
 				u_int8_t type, code;
 			} icmp;
-			struct {
-				__be16 port;
-			} dccp;
 			struct {
 				__be16 port;
 			} sctp;
include/net/netfilter/nf_reject.h +0 -1
index 7c669792fb9c..f1db33bc6bf8 100644
@@ -34,7 +34,6 @@ static inline bool nf_reject_verify_csum(struct sk_buff *skb, int dataoff,
 
 		/* Protocols with partial checksums. */
 		case IPPROTO_UDPLITE:
-		case IPPROTO_DCCP:
 			return false;
 	}
 	return true;
include/net/netns/conntrack.h +0 -13
index bae914815aa3..ab74b5ed0b01 100644
@@ -7,9 +7,6 @@
 #include <linux/atomic.h>
 #include <linux/workqueue.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
-#ifdef CONFIG_NF_CT_PROTO_DCCP
-#include <linux/netfilter/nf_conntrack_dccp.h>
-#endif
 #ifdef CONFIG_NF_CT_PROTO_SCTP
 #include <linux/netfilter/nf_conntrack_sctp.h>
 #endif
@@ -50,13 +47,6 @@ struct nf_icmp_net {
 	unsigned int timeout;
 };
 
-#ifdef CONFIG_NF_CT_PROTO_DCCP
-struct nf_dccp_net {
-	u8 dccp_loose;
-	unsigned int dccp_timeout[CT_DCCP_MAX + 1];
-};
-#endif
-
 #ifdef CONFIG_NF_CT_PROTO_SCTP
 struct nf_sctp_net {
 	unsigned int timeouts[SCTP_CONNTRACK_MAX];
@@ -82,9 +72,6 @@ struct nf_ip_net {
 	struct nf_udp_net	udp;
 	struct nf_icmp_net	icmp;
 	struct nf_icmp_net	icmpv6;
-#ifdef CONFIG_NF_CT_PROTO_DCCP
-	struct nf_dccp_net	dccp;
-#endif
 #ifdef CONFIG_NF_CT_PROTO_SCTP
 	struct nf_sctp_net	sctp;
 #endif
include/net/rstreason.h +1 -1
index 69cb2e52b7da..979ac87b5d99 100644
@@ -36,7 +36,7 @@
 /**
  * enum sk_rst_reason - the reasons of socket reset
  *
- * The reasons of sk reset, which are used in DCCP/TCP/MPTCP protocols.
+ * The reasons of sk reset, which are used in TCP/MPTCP protocols.
  *
  * There are three parts in order:
  * 1) skb drop reasons: relying on drop reasons for such as passive reset
include/net/secure_seq.h +0 -4
index 21e7fa2a1813..cddebafb9f77 100644
@@ -16,9 +16,5 @@ u32 secure_tcpv6_seq(const __be32 *saddr, const __be32 *daddr,
 		     __be16 sport, __be16 dport);
 u32 secure_tcpv6_ts_off(const struct net *net,
 			const __be32 *saddr, const __be32 *daddr);
-u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
-				__be16 sport, __be16 dport);
-u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
-				  __be16 sport, __be16 dport);
 
 #endif /* _NET_SECURE_SEQ */
include/trace/events/sock.h +0 -1
index 3836de435d9d..b5310439536e 100644
@@ -19,7 +19,6 @@
 /* The protocol traced by inet_sock_set_state */
 #define inet_protocol_names		\
 		EM(IPPROTO_TCP)			\
-		EM(IPPROTO_DCCP)		\
 		EM(IPPROTO_SCTP)		\
 		EMe(IPPROTO_MPTCP)
 
include/trace/events/sunrpc.h +0 -2
index 5d331383047b..de214f1dea58 100644
@@ -21,7 +21,6 @@ TRACE_DEFINE_ENUM(SOCK_DGRAM);
 TRACE_DEFINE_ENUM(SOCK_RAW);
 TRACE_DEFINE_ENUM(SOCK_RDM);
 TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
-TRACE_DEFINE_ENUM(SOCK_DCCP);
 TRACE_DEFINE_ENUM(SOCK_PACKET);
 
 #define show_socket_type(type)					\
@@ -31,7 +30,6 @@ TRACE_DEFINE_ENUM(SOCK_PACKET);
 		{ SOCK_RAW,		"RAW" },		\
 		{ SOCK_RDM,		"RDM" },		\
 		{ SOCK_SEQPACKET,	"SEQPACKET" },		\
-		{ SOCK_DCCP,		"DCCP" },		\
 		{ SOCK_PACKET,		"PACKET" })
 
 /* This list is known to be incomplete, add new enums as needed. */
net/Kconfig +0 -1
index c3fca69a7c83..202cc595e5e6 100644
@@ -245,7 +245,6 @@ source "net/bridge/netfilter/Kconfig"
 
 endif
 
-source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"
 source "net/rds/Kconfig"
 source "net/tipc/Kconfig"
net/Makefile +0 -1
index 60ed5190eda8..aac960c41db6 100644
@@ -42,7 +42,6 @@ obj-$(CONFIG_PHONET)		+= phonet/
 ifneq ($(CONFIG_VLAN_8021Q),)
 obj-y				+= 8021q/
 endif
-obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)		+= sctp/
 obj-$(CONFIG_RDS)		+= rds/
 obj-$(CONFIG_WIRELESS)		+= wireless/
net/bridge/netfilter/ebt_ip.c +1 -2
index df372496c1c1..e6dfa3667c04 100644
@@ -117,8 +117,7 @@ static int ebt_ip_mt_check(const struct xt_mtchk_param *par)
 		if (info->protocol != IPPROTO_TCP &&
 		    info->protocol != IPPROTO_UDP &&
 		    info->protocol != IPPROTO_UDPLITE &&
-		    info->protocol != IPPROTO_SCTP &&
-		    info->protocol != IPPROTO_DCCP)
+		    info->protocol != IPPROTO_SCTP)
 			 return -EINVAL;
 	}
 	if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1])
net/bridge/netfilter/ebt_ip6.c +1 -2
index f3225bc31f6c..52c0bfe1ba96 100644
@@ -118,8 +118,7 @@ static int ebt_ip6_mt_check(const struct xt_mtchk_param *par)
 		if (info->protocol != IPPROTO_TCP &&
 		    info->protocol != IPPROTO_UDP &&
 		    info->protocol != IPPROTO_UDPLITE &&
-		    info->protocol != IPPROTO_SCTP &&
-		    info->protocol != IPPROTO_DCCP)
+		    info->protocol != IPPROTO_SCTP)
 			return -EINVAL;
 	}
 	if (info->bitmask & EBT_IP6_DPORT && info->dport[0] > info->dport[1])
net/bridge/netfilter/ebt_log.c +1 -2
index e2eea1daaf8b..ee711543500f 100644
@@ -55,8 +55,7 @@ print_ports(const struct sk_buff *skb, uint8_t protocol, int offset)
 	if (protocol == IPPROTO_TCP ||
 	    protocol == IPPROTO_UDP ||
 	    protocol == IPPROTO_UDPLITE ||
-	    protocol == IPPROTO_SCTP ||
-	    protocol == IPPROTO_DCCP) {
+	    protocol == IPPROTO_SCTP) {
 		const struct tcpudphdr *pptr;
 		struct tcpudphdr _ports;
 
net/core/flow_dissector.c +0 -4
index 1b61bb25ba0e..fcbc66aabf43 100644
@@ -16,7 +16,6 @@
 #include <linux/igmp.h>
 #include <linux/icmp.h>
 #include <linux/sctp.h>
-#include <linux/dccp.h>
 #include <linux/if_tunnel.h>
 #include <linux/if_pppox.h>
 #include <linux/ppp_defs.h>
@@ -1956,9 +1955,6 @@ u32 __skb_get_poff(const struct sk_buff *skb, const void *data,
 	case IPPROTO_IGMP:
 		poff += sizeof(struct igmphdr);
 		break;
-	case IPPROTO_DCCP:
-		poff += sizeof(struct dccp_hdr);
-		break;
 	case IPPROTO_SCTP:
 		poff += sizeof(struct sctphdr);
 		break;
net/core/secure_seq.c +0 -42

45 lines not on this page · raw message

net/core/sock_diag.c +0 -2
index a08eed9b9142..b23594c767f2 100644
@@ -264,8 +264,6 @@ static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 	switch (nlh->nlmsg_type) {
 	case TCPDIAG_GETSOCK:
-	case DCCPDIAG_GETSOCK:
-
 		if (!rcu_access_pointer(inet_rcv_compat))
 			sock_load_diag_module(AF_INET, 0);
 
net/dccp/Kconfig deleted +0 -46

46 lines not on this page · raw message

net/dccp/Makefile deleted +0 -30
deleted file mode 100644
index 5b4ff37bc806..000000000000
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o
-
-dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o \
-	  qpolicy.o
-#
-# CCID algorithms to be used by dccp.ko
-#
-# CCID-2 is default (RFC 4340, p. 77) and has Ack Vectors as dependency
-dccp-y += ccids/ccid2.o ackvec.o
-dccp-$(CONFIG_IP_DCCP_CCID3)	+= ccids/ccid3.o
-dccp-$(CONFIG_IP_DCCP_TFRC_LIB) += ccids/lib/tfrc.o		\
-				   ccids/lib/tfrc_equation.o	\
-				   ccids/lib/packet_history.o	\
-				   ccids/lib/loss_interval.o
-
-dccp_ipv4-y := ipv4.o
-
-# build dccp_ipv6 as module whenever either IPv6 or DCCP is a module
-obj-$(subst y,$(CONFIG_IP_DCCP),$(CONFIG_IPV6)) += dccp_ipv6.o
-dccp_ipv6-y := ipv6.o
-
-obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
-
-dccp-$(CONFIG_SYSCTL) += sysctl.o
-
-dccp_diag-y := diag.o
-
-# build with local directory for trace.h
-CFLAGS_proto.o := -I$(src)
net/dccp/ackvec.c deleted +0 -403

403 lines not on this page · raw message

net/dccp/ackvec.h deleted +0 -136

136 lines not on this page · raw message

net/dccp/ccid.c deleted +0 -219

219 lines not on this page · raw message

net/dccp/ccid.h deleted +0 -262

262 lines not on this page · raw message

net/dccp/ccids/Kconfig deleted +0 -55

55 lines not on this page · raw message

net/dccp/ccids/ccid2.c deleted +0 -794

531 lines not on this page · raw message

net/dccp/ccids/ccid2.h deleted +0 -121

121 lines not on this page · raw message

net/dccp/ccids/ccid3.c deleted +0 -866

866 lines not on this page · raw message

net/dccp/ccids/ccid3.h deleted +0 -148

148 lines not on this page · raw message

net/dccp/ccids/lib/loss_interval.c deleted +0 -184

184 lines not on this page · raw message

net/dccp/ccids/lib/loss_interval.h deleted +0 -69

69 lines not on this page · raw message

net/dccp/ccids/lib/packet_history.c deleted +0 -439

439 lines not on this page · raw message

net/dccp/ccids/lib/packet_history.h deleted +0 -142

142 lines not on this page · raw message

net/dccp/ccids/lib/tfrc.c deleted +0 -46

46 lines not on this page · raw message

net/dccp/ccids/lib/tfrc.h deleted +0 -73

73 lines not on this page · raw message

net/dccp/ccids/lib/tfrc_equation.c deleted +0 -702

702 lines not on this page · raw message

net/dccp/dccp.h deleted +0 -483

483 lines not on this page · raw message

net/dccp/diag.c deleted +0 -85

85 lines not on this page · raw message

net/dccp/feat.c deleted +0 -1581

1,581 lines not on this page · raw message

net/dccp/feat.h deleted +0 -133

133 lines not on this page · raw message

net/dccp/input.c deleted +0 -739

739 lines not on this page · raw message

net/dccp/ipv4.c deleted +0 -1101

1,101 lines not on this page · raw message

net/dccp/ipv6.c deleted +0 -1174

1,174 lines not on this page · raw message

net/dccp/ipv6.h deleted +0 -27
deleted file mode 100644
index c5d14c48def1..000000000000

Lines of this file are not shown. View the raw message.

net/dccp/minisocks.c deleted +0 -266

266 lines not on this page · raw message

net/dccp/options.c deleted +0 -609

609 lines not on this page · raw message

net/dccp/output.c deleted +0 -708

708 lines not on this page · raw message

net/dccp/proto.c deleted +0 -1293

1,293 lines not on this page · raw message

net/dccp/qpolicy.c deleted +0 -136

136 lines not on this page · raw message

net/dccp/sysctl.c deleted +0 -107

107 lines not on this page · raw message

net/dccp/timer.c deleted +0 -272

272 lines not on this page · raw message

net/dccp/trace.h deleted +0 -82

82 lines not on this page · raw message

net/ipv4/Kconfig +1 -1
index 6d2c97f8e9ef..12850a277251 100644

Lines of this file are not shown. View the raw message.

net/ipv4/af_inet.c +1 -4
index 5df1f1325259..76e38092cd8a 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_connection_sock.c +1 -1
index dd5cf8914a28..9a20b84dc022 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_diag.c +0 -2
index c2bb91d9e9ff..907bad776b42 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_output.c +1 -1
index 581bc6289081..ef052ccd9380 100644

Lines of this file are not shown. View the raw message.

net/netfilter/Kconfig +0 -22
index df2dc21304ef..45ee0f425ad2 100644

Lines of this file are not shown. View the raw message.

net/netfilter/Makefile +0 -2
index f0aa4d7ef499..dc223be89aa8 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_conntrack_core.c +1 -9
index 7f8b245e287a..7dda816613e0 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_conntrack_netlink.c +0 -1
index db23876a6016..a98879ed5691 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_conntrack_proto.c +0 -6
index f36727ed91e1..bc1d96686b9c 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_conntrack_proto_dccp.c deleted +0 -826

826 lines not on this page · raw message

net/netfilter/nf_conntrack_standalone.c +0 -92

92 lines not on this page · raw message

net/netfilter/nf_nat_core.c +0 -6
index aad84aabd7f1..72f608782d95 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_nat_proto.c +0 -44

44 lines not on this page · raw message

net/netfilter/nfnetlink_cttimeout.c +0 -5
index eab4f476b47f..38d75484e531 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nft_ct.c +0 -1
index d526e69a2a2b..4842dbb3081a 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nft_exthdr.c +0 -106

106 lines not on this page · raw message

net/netfilter/xt_dccp.c deleted +0 -185

185 lines not on this page · raw message

net/netfilter/xt_multiport.c +3 -3
index 44a00f5acde8..832f3872f506 100644

Lines of this file are not shown. View the raw message.

samples/bpf/sockex2_kern.c +0 -1
index b7997541f7ee..f93d9145ab8a 100644

Lines of this file are not shown. View the raw message.

scripts/checkpatch.pl +1 -1
index 784912f570e9..f5af58f0e2aa 100755

Lines of this file are not shown. View the raw message.

security/lsm_audit.c +0 -19
index 1b942b4908a2..7d623b00495c 100644

Lines of this file are not shown. View the raw message.

security/selinux/hooks.c +1 -40

41 lines not on this page · raw message

security/selinux/include/classmap.h +0 -2
index 04a9b480885e..5665aa5e7853 100644

Lines of this file are not shown. View the raw message.

security/selinux/nlmsgtab.c +0 -1
index 3a95986b134f..2c0b07f9fbbd 100644

Lines of this file are not shown. View the raw message.

security/smack/smack_lsm.c +1 -8
index 99833168604e..fc340a6f0dde 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.48.1

Part of the diff is not shown here. View the raw message.

maintainer
#3 lore raw
Quoted 35 lines · Kuniyuki Iwashima

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot. Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP. The repository is hosted on GitHub [1], and development is not taking place through the upstream community. While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

"This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP. It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Quoted 6 lines

Note that we leave uAPI headers alone for userspace programs.

Adding the LSM and SELinux lists for obvious reasons, as well as Casey directly since he maintains Smack and I don't see him on the To/CC line.

For those that weren't on the original posting, the lore link is below:
https://lore.kernel.org/all/[email protected]

security/selinux/include/classmap.h const struct security_class_mapping secclass_map[] = { · line 132

Quoted 13 lines
security/selinux/include/classmap.h +0 -2
index 04a9b480885e..5665aa5e7853 100644
@@ -127,8 +127,6 @@ const struct security_class_mapping secclass_map[] = {
        { "key",
          { "view", "read", "write", "search", "link", "setattr", "create",
            NULL } },
-       { "dccp_socket",
-         { COMMON_SOCK_PERMS, "node_bind", "name_connect", NULL } },
        { "memprotect", { "mmap_zero", NULL } },
        { "peer", { "recv", NULL } },
        { "capability2", { COMMON_CAP2_PERMS, NULL } },

A quick question for the rest of the SELinux folks: the DCCP code is going away, so we won't be performing any of the access checks listed above, and there will be no way to get a "dccp_socket" object, but do we want to preserve the class/perms simply to quiet the warning when loading existing policies?

Personally I'm not too bothered by those warnings, I see them fairly regularly for a few classes/perms on my test systems, but thought it was worth having a quick discussion on this one since it is a bit different.

Signature · 1 line
paul-moore.com
#4 lore raw

Apr 8, 2025 03:35:15 Paul Moore <[email protected]>:

Quoted 61 lines · Kuniyuki Iwashima
Quoted 35 lines

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot.  Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP.  The repository is hosted on GitHub [1], and development is not taking place through the upstream community.  While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

  "This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP.  It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Quoted 6 lines

Note that we leave uAPI headers alone for userspace programs.

Adding the LSM and SELinux lists for obvious reasons, as well as Casey directly since he maintains Smack and I don't see him on the To/CC line.

For those that weren't on the original posting, the lore link is below:
https://lore.kernel.org/all/[email protected]

Quoted 11 lines
security/selinux/include/classmap.h +0 -2
index 04a9b480885e..5665aa5e7853 100644
@@ -127,8 +127,6 @@ const struct security_class_mapping secclass_map[] = {
         { "key",
           { "view", "read", "write", "search", "link", "setattr", "create",
             NULL } },
-       { "dccp_socket",
-         { COMMON_SOCK_PERMS, "node_bind", "name_connect", NULL } },
         { "memprotect", { "mmap_zero", NULL } },
Quoted 8 lines

security/selinux/include/classmap.h const struct security_class_mapping secclass_map[] = { · line 132

Quoted 2 lines
security/selinux/include/classmap.h +0 -0
         { "peer", { "recv", NULL } },
         { "capability2", { COMMON_CAP2_PERMS, NULL } },

A quick question for the rest of the SELinux folks: the DCCP code is going away, so we won't be performing any of the access checks listed above, and there will be no way to get a "dccp_socket" object, but do we want to preserve the class/perms simply to quiet the warning when loading existing policies?

Isn't the kernel just warning about missing clssses/permissions? If policies still define dccp_socket I think the kernel treats it as user space class, like dbus.

Quoted 7 lines

Personally I'm not too bothered by those warnings, I see them fairly regularly for a few classes/perms on my test systems, but thought it was worth having a quick discussion on this one since it is a bit different.

--
paul-moore.com

maintainer Acked-by
#5 lore raw
Quoted 71 lines · Christian Göttsche

Apr 8, 2025 03:35:15 Paul Moore <[email protected]>:

Quoted 61 lines · Kuniyuki Iwashima
Quoted 35 lines

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot. Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP. The repository is hosted on GitHub [1], and development is not taking place through the upstream community. While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

"This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP. It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Quoted 6 lines

Note that we leave uAPI headers alone for userspace programs.

Adding the LSM and SELinux lists for obvious reasons, as well as Casey directly since he maintains Smack and I don't see him on the To/CC line.

For those that weren't on the original posting, the lore link is below:
https://lore.kernel.org/all/[email protected]

Quoted 11 lines
security/selinux/include/classmap.h +0 -2
index 04a9b480885e..5665aa5e7853 100644
@@ -127,8 +127,6 @@ const struct security_class_mapping secclass_map[] = {
        { "key",
          { "view", "read", "write", "search", "link", "setattr", "create",
            NULL } },
-       { "dccp_socket",
-         { COMMON_SOCK_PERMS, "node_bind", "name_connect", NULL } },
        { "memprotect", { "mmap_zero", NULL } },
Quoted 8 lines

security/selinux/include/classmap.h const struct security_class_mapping secclass_map[] = { · line 132

Quoted 2 lines
security/selinux/include/classmap.h +0 -0
        { "peer", { "recv", NULL } },
        { "capability2", { COMMON_CAP2_PERMS, NULL } },

A quick question for the rest of the SELinux folks: the DCCP code is going away, so we won't be performing any of the access checks listed above, and there will be no way to get a "dccp_socket" object, but do we want to preserve the class/perms simply to quiet the warning when loading existing policies?

Quoted 1 line

Isn't the kernel just warning about missing clssses/permissions? If policies still define dccp_socket I think the kernel treats it as user space class, like dbus.

Ah yes, my apologies, I mixed up the "... not defined in policy" warning in my mind. Thanks for setting me straight :)

Anyway, this looks fine to me.

Signature · 1 line
paul-moore.com
maintainer Acked-by
#6 lore raw
In reply to Christian Göttsche
Quoted 46 lines · Christian Göttsche

Apr 8, 2025 03:35:15 Paul Moore <[email protected]>:

Quoted 44 lines · Kuniyuki Iwashima
Quoted 34 lines

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot.  Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP.  The repository is hosted on GitHub [1], and development is not taking place through the upstream community.  While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

  "This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP.  It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Quoted 6 lines

Note that we leave uAPI headers alone for userspace programs.

Adding the LSM and SELinux lists for obvious reasons, as well as Casey directly since he maintains Smack and I don't see him on the To/CC line.

It's annoying that I found out about this indirectly. No biscuit.

Nonetheless, for the Smack bits:

#7 lore raw
In reply to Kuniyuki Iwashima

Hi Kuniyuki,

Quoted 25 lines · Kuniyuki Iwashima

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot. Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP. The repository is hosted on GitHub [1], and development is not taking place through the upstream community. While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

"This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Quoted 8 lines

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP. It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Netfilter parses skbuffs, in that sense, it is a middlebox. Main concern on my side is that it could break rulesets, even for people that don't really see dccp traffic ever, ruleset could stop loading.

I would keep the netfilter bits aside by now, based on your netfilter updates, we can internally discuss how to phase out dccp support to get aligned with netdev maintainers, as it seems there is a wish to reduce debt in this front.

Having said, this Netfilter does not rely on any of this socket structures, I think it should not be an impediment for your tree spring cleanup (IIRC we have no hard dependencies on CONFIG_DCCP).

Quoted 1 line

Note that we leave uAPI headers alone for userspace programs.

#8 lore raw

From: Pablo Neira Ayuso <[email protected]>
Date: Tue, 8 Apr 2025 18:37:36 +0200

Quoted 37 lines

Hi Kuniyuki,

Quoted 25 lines · Kuniyuki Iwashima

DCCP was orphaned in 2021 by commit 054c4610bd05 ("MAINTAINERS: dccp:
move Gerrit Renker to CREDITS"), which noted that the last maintainer had been inactive for five years.

In recent years, it has become a playground for syzbot, and most changes to DCCP have been odd bug fixes triggered by syzbot. Apart from that, the only changes have been driven by treewide or networking API updates or adjustments related to TCP.

Thus, in 2023, we announced we would remove DCCP in 2025 via commit b144fcaf46d4 ("dccp: Print deprecation notice.").

Since then, only one individual has contacted the netdev mailing list. [0]

There is ongoing research for Multipath DCCP. The repository is hosted on GitHub [1], and development is not taking place through the upstream community. While the repository is published under the GPLv2 license, the scheduling part remains proprietary, with a LICENSE file [2] stating:

"This is not Open Source software."

The researcher mentioned a plan to address the licensing issue, upstream the patches, and step up as a maintainer, but there has been no further communication since then.

Quoted 8 lines

Maintaining DCCP for a decade without any real users has become a burden.

Therefore, it's time to remove it.

Removing DCCP will also provide significant benefits to TCP. It allows us to freely reorganize the layout of struct inet_connection_sock, which is currently shared with DCCP, and optimize it to reduce the number of cachelines accessed in the TCP fast path.

Quoted 8 lines

Netfilter parses skbuffs, in that sense, it is a middlebox. Main concern on my side is that it could break rulesets, even for people that don't really see dccp traffic ever, ruleset could stop loading.

I would keep the netfilter bits aside by now, based on your netfilter updates, we can internally discuss how to phase out dccp support to get aligned with netdev maintainers, as it seems there is a wish to reduce debt in this front.

Fair enough. I'll drop the netfilter stuff in v2.

Quoted 4 lines

Having said, this Netfilter does not rely on any of this socket structures, I think it should not be an impediment for your tree spring cleanup (IIRC we have no hard dependencies on CONFIG_DCCP).

Yes, actually I split changes for net/dccp, netfilter, and LSM initially, and then, even without net/dccp, netfilter compiled successfully if include/linux/dccp.h (dccp_hdr etc) was not removed.

Thanks!

---
pw-bot: cr

#9 lore raw

PATCH 3/4 net: Unexport shared functions for DCCP.

In reply to Kuniyuki Iwashima

DCCP was removed, so many inet functions no longer need to be exported.

Let's unexport or use EXPORT_IPV6_MOD() for such functions.

sk_free_unlock_clone() is inlined in sk_clone_lock() as it's the only caller.

---
 include/net/sock.h               |  1 -
 net/core/sock.c                  | 24 ++++++++----------------
 net/ipv4/inet_connection_sock.c  | 12 +-----------
 net/ipv4/inet_hashtables.c       | 16 +++++-----------
 net/ipv4/inet_timewait_sock.c    |  6 +-----
 net/ipv6/af_inet6.c              |  1 -
 net/ipv6/inet6_connection_sock.c |  2 --
 7 files changed, 15 insertions(+), 47 deletions(-)
include/net/sock.h +0 -1
index 8daf1b3b12c6..0d13d021ef5e 100644
@@ -1745,7 +1745,6 @@ void sk_free(struct sock *sk);
 void sk_net_refcnt_upgrade(struct sock *sk);
 void sk_destruct(struct sock *sk);
 struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority);
-void sk_free_unlock_clone(struct sock *sk);
 
 struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force,
 			     gfp_t priority);
net/core/sock.c +8 -16
index 323892066def..e76b2bcec33d 100644
@@ -2489,17 +2489,14 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
 		 */
 		if (!is_charged)
 			RCU_INIT_POINTER(newsk->sk_filter, NULL);
-		sk_free_unlock_clone(newsk);
-		newsk = NULL;
+
 		goto out;
 	}
+
 	RCU_INIT_POINTER(newsk->sk_reuseport_cb, NULL);
 
-	if (bpf_sk_storage_clone(sk, newsk)) {
-		sk_free_unlock_clone(newsk);
-		newsk = NULL;
+	if (bpf_sk_storage_clone(sk, newsk))
 		goto out;
-	}
 
 	/* Clear sk_user_data if parent had the pointer tagged
 	 * as not suitable for copying when cloning.
@@ -2528,19 +2525,14 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
 	if (sock_needs_netstamp(sk) && newsk->sk_flags & SK_FLAGS_TIMESTAMP)
 		net_enable_timestamp();
 out:
-	return newsk;
-}
-EXPORT_SYMBOL_GPL(sk_clone_lock);
-
-void sk_free_unlock_clone(struct sock *sk)
-{
 	/* It is still raw copy of parent, so invalidate
 	 * destructor and make plain sk_free() */
-	sk->sk_destruct = NULL;
-	bh_unlock_sock(sk);
-	sk_free(sk);
+	newsk->sk_destruct = NULL;
+	bh_unlock_sock(newsk);
+	sk_free(newsk);
+	return NULL;
 }
-EXPORT_SYMBOL_GPL(sk_free_unlock_clone);
+EXPORT_SYMBOL_GPL(sk_clone_lock);
 
 static u32 sk_dst_gso_max_size(struct sock *sk, struct dst_entry *dst)
 {
net/ipv4/inet_connection_sock.c +1 -11
index 9a20b84dc022..a195203e7eef 100644
@@ -767,7 +767,6 @@ void inet_csk_init_xmit_timers(struct sock *sk,
 	timer_setup(&sk->sk_timer, keepalive_handler, 0);
 	icsk->icsk_pending = icsk->icsk_ack.pending = 0;
 }
-EXPORT_SYMBOL(inet_csk_init_xmit_timers);
 
 void inet_csk_clear_xmit_timers(struct sock *sk)
 {
@@ -780,7 +779,6 @@ void inet_csk_clear_xmit_timers(struct sock *sk)
 	sk_stop_timer(sk, &icsk->icsk_delack_timer);
 	sk_stop_timer(sk, &sk->sk_timer);
 }
-EXPORT_SYMBOL(inet_csk_clear_xmit_timers);
 
 void inet_csk_clear_xmit_timers_sync(struct sock *sk)
 {
@@ -831,7 +829,6 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk,
 	__IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
 	return NULL;
 }
-EXPORT_SYMBOL_GPL(inet_csk_route_req);
 
 struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
 					    struct sock *newsk,
@@ -898,7 +895,6 @@ int inet_rtx_syn_ack(const struct sock *parent, struct request_sock *req)
 		req->num_retrans++;
 	return err;
 }
-EXPORT_SYMBOL(inet_rtx_syn_ack);
 
 static struct request_sock *
 reqsk_alloc_noprof(const struct request_sock_ops *ops, struct sock *sk_listener,
@@ -1058,14 +1054,13 @@ bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req)
 {
 	return __inet_csk_reqsk_queue_drop(sk, req, false);
 }
-EXPORT_SYMBOL(inet_csk_reqsk_queue_drop);
 
 void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req)
 {
 	inet_csk_reqsk_queue_drop(sk, req);
 	reqsk_put(req);
 }
-EXPORT_SYMBOL(inet_csk_reqsk_queue_drop_and_put);
+EXPORT_IPV6_MOD(inet_csk_reqsk_queue_drop_and_put);
 
 static void reqsk_timer_handler(struct timer_list *t)
 {
@@ -1209,7 +1204,6 @@ bool inet_csk_reqsk_queue_hash_add(struct sock *sk, struct request_sock *req,
 	inet_csk_reqsk_queue_added(sk);
 	return true;
 }
-EXPORT_SYMBOL_GPL(inet_csk_reqsk_queue_hash_add);
 
 static void inet_clone_ulp(const struct request_sock *req, struct sock *newsk,
 			   const gfp_t priority)
@@ -1290,7 +1284,6 @@ struct sock *inet_csk_clone_lock(const struct sock *sk,
 
 	return newsk;
 }
-EXPORT_SYMBOL_GPL(inet_csk_clone_lock);
 
 /*
  * At this point, there should be no process reference to this
@@ -1380,7 +1373,6 @@ int inet_csk_listen_start(struct sock *sk)
 	inet_sk_set_state(sk, TCP_CLOSE);
 	return err;
 }
-EXPORT_SYMBOL_GPL(inet_csk_listen_start);
 
 static void inet_child_forget(struct sock *sk, struct request_sock *req,
 			      struct sock *child)
@@ -1475,7 +1467,6 @@ struct sock *inet_csk_complete_hashdance(struct sock *sk, struct sock *child,
 	sock_put(child);
 	return NULL;
 }
-EXPORT_SYMBOL(inet_csk_complete_hashdance);
 
 /*
  *	This routine closes sockets which have been at least partially
@@ -1590,4 +1581,3 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu)
 out:
 	return dst;
 }
-EXPORT_SYMBOL_GPL(inet_csk_update_pmtu);
net/ipv4/inet_hashtables.c +5 -11
index 5bf163f756e9..d1960701a3b4 100644
@@ -713,7 +713,7 @@ bool inet_ehash_nolisten(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 	}
 	return ok;
 }
-EXPORT_SYMBOL_GPL(inet_ehash_nolisten);
+EXPORT_IPV6_MOD(inet_ehash_nolisten);
 
 static int inet_reuseport_add_sock(struct sock *sk,
 				   struct inet_listen_hashbucket *ilb)
@@ -771,7 +771,7 @@ int __inet_hash(struct sock *sk, struct sock *osk)
 
 	return err;
 }
-EXPORT_SYMBOL(__inet_hash);
+EXPORT_IPV6_MOD(__inet_hash);
 
 int inet_hash(struct sock *sk)
 {
@@ -782,7 +782,6 @@ int inet_hash(struct sock *sk)
 
 	return err;
 }
-EXPORT_SYMBOL_GPL(inet_hash);
 
 void inet_unhash(struct sock *sk)
 {
@@ -823,7 +822,7 @@ void inet_unhash(struct sock *sk)
 		spin_unlock_bh(lock);
 	}
 }
-EXPORT_SYMBOL_GPL(inet_unhash);
+EXPORT_IPV6_MOD(inet_unhash);
 
 static bool inet_bind2_bucket_match(const struct inet_bind2_bucket *tb,
 				    const struct net *net, unsigned short port,
@@ -982,14 +981,14 @@ int inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family)
 {
 	return __inet_bhash2_update_saddr(sk, saddr, family, false);
 }
-EXPORT_SYMBOL_GPL(inet_bhash2_update_saddr);
+EXPORT_IPV6_MOD(inet_bhash2_update_saddr);
 
 void inet_bhash2_reset_saddr(struct sock *sk)
 {
 	if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK))
 		__inet_bhash2_update_saddr(sk, NULL, 0, true);
 }
-EXPORT_SYMBOL_GPL(inet_bhash2_reset_saddr);
+EXPORT_IPV6_MOD(inet_bhash2_reset_saddr);
 
 /* RFC 6056 3.3.4.  Algorithm 4: Double-Hash Port Selection Algorithm
  * Note that we use 32bit integers (vs RFC 'short integers')
@@ -1214,7 +1213,6 @@ int inet_hash_connect(struct inet_timewait_death_row *death_row,
 	return __inet_hash_connect(death_row, sk, port_offset, hash_port0,
 				   __inet_check_established);
 }
-EXPORT_SYMBOL_GPL(inet_hash_connect);
 
 static void init_hashinfo_lhash2(struct inet_hashinfo *h)
 {
@@ -1265,7 +1263,6 @@ int inet_hashinfo2_init_mod(struct inet_hashinfo *h)
 	init_hashinfo_lhash2(h);
 	return 0;
 }
-EXPORT_SYMBOL_GPL(inet_hashinfo2_init_mod);
 
 int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
 {
@@ -1305,7 +1302,6 @@ int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
 	hashinfo->ehash_locks_mask = nblocks - 1;
 	return 0;
 }
-EXPORT_SYMBOL_GPL(inet_ehash_locks_alloc);
 
 struct inet_hashinfo *inet_pernet_hashinfo_alloc(struct inet_hashinfo *hashinfo,
 						 unsigned int ehash_entries)
@@ -1341,7 +1337,6 @@ struct inet_hashinfo *inet_pernet_hashinfo_alloc(struct inet_hashinfo *hashinfo,
 err:
 	return NULL;
 }
-EXPORT_SYMBOL_GPL(inet_pernet_hashinfo_alloc);
 
 void inet_pernet_hashinfo_free(struct inet_hashinfo *hashinfo)
 {
@@ -1352,4 +1347,3 @@ void inet_pernet_hashinfo_free(struct inet_hashinfo *hashinfo)
 	vfree(hashinfo->ehash);
 	kfree(hashinfo);
 }
-EXPORT_SYMBOL_GPL(inet_pernet_hashinfo_free);
net/ipv4/inet_timewait_sock.c +1 -5
index aded4bf1bc16..36fb0a0ba697 100644
@@ -84,7 +84,7 @@ void inet_twsk_put(struct inet_timewait_sock *tw)
 	if (refcount_dec_and_test(&tw->tw_refcnt))
 		inet_twsk_free(tw);
 }
-EXPORT_SYMBOL_GPL(inet_twsk_put);
+EXPORT_IPV6_MOD(inet_twsk_put);
 
 static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
 				   struct hlist_nulls_head *list)
@@ -166,7 +166,6 @@ void inet_twsk_hashdance_schedule(struct inet_timewait_sock *tw,
 	spin_unlock(lock);
 	local_bh_enable();
 }
-EXPORT_SYMBOL_GPL(inet_twsk_hashdance_schedule);
 
 static void tw_timer_handler(struct timer_list *t)
 {
@@ -223,7 +222,6 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
 
 	return tw;
 }
-EXPORT_SYMBOL_GPL(inet_twsk_alloc);
 
 /* These are always called from BH context.  See callers in
  * tcp_input.c to verify this.
@@ -306,7 +304,6 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm)
 		mod_timer_pending(&tw->tw_timer, jiffies + timeo);
 	}
 }
-EXPORT_SYMBOL_GPL(__inet_twsk_schedule);
 
 /* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */
 void inet_twsk_purge(struct inet_hashinfo *hashinfo)
@@ -365,4 +362,3 @@ void inet_twsk_purge(struct inet_hashinfo *hashinfo)
 		rcu_read_unlock();
 	}
 }
-EXPORT_SYMBOL_GPL(inet_twsk_purge);
net/ipv6/af_inet6.c +0 -1
index f60ec8b0f8ea..85bf681d427b 100644
@@ -881,7 +881,6 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,
 	}
 	return false;
 }
-EXPORT_SYMBOL_GPL(ipv6_opt_accepted);
 
 static struct packet_type ipv6_packet_type __read_mostly = {
 	.type = cpu_to_be16(ETH_P_IPV6),
net/ipv6/inet6_connection_sock.c +0 -2
index dbcf556a35bb..8f500eaf33cf 100644
@@ -54,7 +54,6 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk,
 
 	return dst;
 }
-EXPORT_SYMBOL(inet6_csk_route_req);
 
 static inline
 struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
@@ -137,4 +136,3 @@ struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu)
 	dst = inet6_csk_route_socket(sk, &fl6);
 	return IS_ERR(dst) ? NULL : dst;
 }
-EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);
Signature · 1 line
2.48.1
maintainer
#10 lore raw

Re: [PATCH v1 net-next 3/4] net: Unexport shared functions for DCCP.

Quoted 7 lines · On Mon, 7 Apr 2025 16:17:50 -0700 Kuniyuki Iwashima wrote:

DCCP was removed, so many inet functions no longer need to be exported.

Let's unexport or use EXPORT_IPV6_MOD() for such functions.

sk_free_unlock_clone() is inlined in sk_clone_lock() as it's the only caller.

netfilter wants inet_twsk_put

ERROR: modpost: "inet_twsk_put" [net/ipv4/netfilter/nf_tproxy_ipv4.ko] undefined!
ERROR: modpost: "inet_twsk_put" [net/ipv6/netfilter/nf_tproxy_ipv6.ko] undefined!

allmodconfig builds seems to miss it :(

Signature · 1 line
pw-bot: cr
#11 lore raw

Re: [PATCH v1 net-next 3/4] net: Unexport shared functions for DCCP.

From: Jakub Kicinski <[email protected]>
Date: Tue, 8 Apr 2025 16:25:12 -0700

Quoted 9 lines · On Mon, 7 Apr 2025 16:17:50 -0700 Kuniyuki Iwashima wrote:
Quoted 7 lines

DCCP was removed, so many inet functions no longer need to be exported.

Let's unexport or use EXPORT_IPV6_MOD() for such functions.

sk_free_unlock_clone() is inlined in sk_clone_lock() as it's the only caller.

Quoted 6 lines

netfilter wants inet_twsk_put

ERROR: modpost: "inet_twsk_put" [net/ipv4/netfilter/nf_tproxy_ipv4.ko] undefined!
ERROR: modpost: "inet_twsk_put" [net/ipv6/netfilter/nf_tproxy_ipv6.ko] undefined!

allmodconfig builds seems to miss it :(

Thanks for catching this!

I actually had ran allmodconfig but it couldn't catch it because the error would be reproducible with IPV6=y.

I'll test allmodconfig + IPV6=y explicitly for v2.

#12 lore raw

PATCH 4/4 tcp: Rename tcp_or_dccp_get_hashinfo().

In reply to Kuniyuki Iwashima

DCCP was removed, so tcp_or_dccp_get_hashinfo() should be renamed.

Let's rename it to tcp_get_hashinfo().

---
 include/net/inet_hashtables.h   |  3 +--
 net/ipv4/inet_connection_sock.c |  9 +++++----
 net/ipv4/inet_hashtables.c      | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)
include/net/inet_hashtables.h +1 -2
index d172b64a6320..4564b5d348b1 100644
@@ -175,9 +175,8 @@ struct inet_hashinfo {
 	bool				pernet;
 } ____cacheline_aligned_in_smp;
 
-static inline struct inet_hashinfo *tcp_or_dccp_get_hashinfo(const struct sock *sk)
+static inline struct inet_hashinfo *tcp_get_hashinfo(const struct sock *sk)
 {
-	/* TODO: rename function */
 	return sock_net(sk)->ipv4.tcp_death_row.hashinfo;
 }
 
net/ipv4/inet_connection_sock.c +5 -4
index a195203e7eef..20915895bdaa 100644
@@ -330,7 +330,7 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,
 			struct inet_bind2_bucket **tb2_ret,
 			struct inet_bind_hashbucket **head2_ret, int *port_ret)
 {
-	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);
 	int i, low, high, attempt_half, port, l3mdev;
 	struct inet_bind_hashbucket *head, *head2;
 	struct net *net = sock_net(sk);
@@ -512,10 +512,10 @@ void inet_csk_update_fastreuse(struct inet_bind_bucket *tb,
  */
 int inet_csk_get_port(struct sock *sk, unsigned short snum)
 {
-	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);
 	bool reuse = sk->sk_reuse && sk->sk_state != TCP_LISTEN;
 	bool found_port = false, check_bind_conflict = true;
 	bool bhash_created = false, bhash2_created = false;
+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);
 	int ret = -EADDRINUSE, port = snum, l3mdev;
 	struct inet_bind_hashbucket *head, *head2;
 	struct inet_bind2_bucket *tb2 = NULL;
@@ -1022,9 +1022,10 @@ static bool reqsk_queue_unlink(struct request_sock *req)
 	bool found = false;
 
 	if (sk_hashed(sk)) {
-		struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);
-		spinlock_t *lock = inet_ehash_lockp(hashinfo, req->rsk_hash);
+		struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);
+		spinlock_t *lock;
 
+		lock = inet_ehash_lockp(hashinfo, req->rsk_hash);
 		spin_lock(lock);
 		found = __sk_nulls_del_node_init_rcu(sk);
 		spin_unlock(lock);
net/ipv4/inet_hashtables.c +7 -7
index d1960701a3b4..da85cc30e382 100644
@@ -176,7 +176,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
  */
 static void __inet_put_port(struct sock *sk)
 {
-	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);
 	struct inet_bind_hashbucket *head, *head2;
 	struct net *net = sock_net(sk);
 	struct inet_bind_bucket *tb;
@@ -215,7 +215,7 @@ EXPORT_SYMBOL(inet_put_port);
 
 int __inet_inherit_port(const struct sock *sk, struct sock *child)
 {
-	struct inet_hashinfo *table = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *table = tcp_get_hashinfo(sk);
 	unsigned short port = inet_sk(child)->inet_num;
 	struct inet_bind_hashbucket *head, *head2;
 	bool created_inet_bind_bucket = false;
@@ -668,7 +668,7 @@ static bool inet_ehash_lookup_by_sk(struct sock *sk,
  */
 bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk)
 {
-	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);
 	struct inet_ehash_bucket *head;
 	struct hlist_nulls_head *list;
 	spinlock_t *lock;
@@ -740,7 +740,7 @@ static int inet_reuseport_add_sock(struct sock *sk,
 
 int __inet_hash(struct sock *sk, struct sock *osk)
 {
-	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);
 	struct inet_listen_hashbucket *ilb2;
 	int err = 0;
 
@@ -785,7 +785,7 @@ int inet_hash(struct sock *sk)
 
 void inet_unhash(struct sock *sk)
 {
-	struct inet_hashinfo *hashinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);
 
 	if (sk_unhashed(sk))
 		return;
@@ -873,7 +873,7 @@ inet_bind2_bucket_find(const struct inet_bind_hashbucket *head, const struct net
 struct inet_bind_hashbucket *
 inet_bhash2_addr_any_hashbucket(const struct sock *sk, const struct net *net, int port)
 {
-	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);
 	u32 hash;
 
 #if IS_ENABLED(CONFIG_IPV6)
@@ -901,7 +901,7 @@ static void inet_update_saddr(struct sock *sk, void *saddr, int family)
 
 static int __inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family, bool reset)
 {
-	struct inet_hashinfo *hinfo = tcp_or_dccp_get_hashinfo(sk);
+	struct inet_hashinfo *hinfo = tcp_get_hashinfo(sk);
 	struct inet_bind_hashbucket *head, *head2;
 	struct inet_bind2_bucket *tb2, *new_tb2;
 	int l3mdev = inet_sk_bound_l3mdev(sk);
Signature · 1 line
2.48.1