Skip to contentSkip to conversation

sysctl net: Remove macro checks for CONFIG_SYSCTL

PATCH Applied Denis Kirjanov 3 participants 5 messages Jan 19, 2025 – Jan 21, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sysctl net: Remove macro checks for CONFIG_SYSCTL

Since dccp and llc makefiles already check sysctl code compilation with xxx-$(CONFIG_SYSCTL)
we can drop the checks

---
changelog:
v2: fix the spelling mistake "witn" -> "with"

 net/dccp/sysctl.c        | 4 ----
 net/llc/sysctl_net_llc.c | 4 ----
 2 files changed, 8 deletions(-)
net/dccp/sysctl.c +0 -4
index 3fc474d6e57d..b15845fd6300 100644
@@ -11,10 +11,6 @@
 #include "dccp.h"
 #include "feat.h"
 
-#ifndef CONFIG_SYSCTL
-#error This file should not be compiled without CONFIG_SYSCTL defined
-#endif
-
 /* Boundary values */
 static int		u8_max   = 0xFF;
 static unsigned long	seqw_min = DCCPF_SEQ_WMIN,
net/llc/sysctl_net_llc.c +0 -4
index 72e101135f8c..c8d88e2508fc 100644
@@ -11,10 +11,6 @@
 #include <net/net_namespace.h>
 #include <net/llc.h>
 
-#ifndef CONFIG_SYSCTL
-#error This file should not be compiled without CONFIG_SYSCTL defined
-#endif
-
 static struct ctl_table llc2_timeout_table[] = {
 	{
 		.procname	= "ack",
Signature · 1 line
2.43.0
#1 lore raw
Quoted 19 lines · Denis Kirjanov

Since dccp and llc makefiles already check sysctl code compilation with xxx-$(CONFIG_SYSCTL)
we can drop the checks

---
changelog:
v2: fix the spelling mistake "witn" -> "with"

 net/dccp/sysctl.c        | 4 ----
 net/llc/sysctl_net_llc.c | 4 ----
 2 files changed, 8 deletions(-)
net/dccp/sysctl.c +0 -0
index 3fc474d6e57d..b15845fd6300 100644

net/dccp/sysctl.c line 17

Quoted 7 lines
net/dccp/sysctl.c +0 -4
@@ -11,10 +11,6 @@
 #include "dccp.h"
 #include "feat.h"
 
-#ifndef CONFIG_SYSCTL
-#error This file should not be compiled without CONFIG_SYSCTL defined
-#endif
-

I'd like to know if you're still using DCCP since as far as I know it will soon be deprecated... If not, the whole code will be removed.

Please take a look at the commit:
commit b144fcaf46d43b1471ad6e4de66235b8cebb3c87

Author: Kuniyuki Iwashima <[email protected]>
Date:   Wed Jun 14 12:47:05 2023 -0700

dccp: Print deprecation notice.

DCCP was marked as Orphan in the MAINTAINERS entry 2 years ago in commit 054c4610bd05 ("MAINTAINERS: dccp: move Gerrit Renker to CREDITS"). It says we haven't heard from the maintainer for five years, so DCCP is not well maintained for 7 years now.

Recently DCCP only receives updates for bugs, and major distros disable it by default.

Removing DCCP would allow for better organisation of TCP fields to reduce the number of cache lines hit in the fast path.

Let's add a deprecation notice when DCCP socket is created and schedule its removal to 2025.

Thanks,
Jason

#2 lore raw
Quoted 11 lines

Please take a look at the commit:
commit b144fcaf46d43b1471ad6e4de66235b8cebb3c87

Author: Kuniyuki Iwashima <[email protected]>
Date:   Wed Jun 14 12:47:05 2023 -0700

dccp: Print deprecation notice.

DCCP was marked as Orphan in the MAINTAINERS entry 2 years ago in commit 054c4610bd05 ("MAINTAINERS: dccp: move Gerrit Renker to CREDITS"). It says we haven't heard from the maintainer for five years, so DCCP is not well maintained for 7 years now.

Yes, but on another hand I see that it's evolving, like MP-DCCP and the according ietf draft
here: https://datatracker.ietf.org/doc/draft-ietf-tsvwg-multipath-dccp/20/

Also there is a out-of-the tree repo available with the implementation of mp-dccp:
https://github.com/telekom/mp-dccp

Quoted 12 lines

Recently DCCP only receives updates for bugs, and major distros disable it by default.

Removing DCCP would allow for better organisation of TCP fields to reduce the number of cache lines hit in the fast path.

Let's add a deprecation notice when DCCP socket is created and schedule its removal to 2025.

Thanks,
Jason

Signature · 2 lines
Regards / Mit besten Grüßen,
Denis
#3 lore raw
Quoted 13 lines · Denis Kirjanov
Quoted 6 lines

Please take a look at the commit:
commit b144fcaf46d43b1471ad6e4de66235b8cebb3c87

Author: Kuniyuki Iwashima <[email protected]>
Date:   Wed Jun 14 12:47:05 2023 -0700
Quoted 6 lines

dccp: Print deprecation notice.

DCCP was marked as Orphan in the MAINTAINERS entry 2 years ago in commit 054c4610bd05 ("MAINTAINERS: dccp: move Gerrit Renker to CREDITS"). It says we haven't heard from the maintainer for five years, so DCCP is not well maintained for 7 years now.

Quoted 7 lines

Yes, but on another hand I see that it's evolving, like MP-DCCP and the according ietf draft
here: https://datatracker.ietf.org/doc/draft-ietf-tsvwg-multipath-dccp/20/

Also there is a out-of-the tree repo available with the implementation of mp-dccp:
https://github.com/telekom/mp-dccp

Interesting. Thanks for letting me know. It seems that we have to remove the deprecation warning...

Thanks,
Jason

#4 lore raw
In reply to Denis Kirjanov
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Sun, 19 Jan 2025 16:42:53 +0300 you wrote:

Since dccp and llc makefiles already check sysctl code compilation with xxx-$(CONFIG_SYSCTL)
we can drop the checks

---
changelog:
v2: fix the spelling mistake "witn" -> "with"

[...]

Here is the summary with links:
- [v2,net-next] sysctl net: Remove macro checks for CONFIG_SYSCTL

    https://git.kernel.org/netdev/net-next/c/19d7750a06bb

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html