Skip to content

Removal of binary sysctl support

Eric W. Biederman linux-wireless lkml netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest23 patches 29 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23sysctl: Remove the unused frv sysctl unumbersarch/frv/kernel/pm.c arch/frv/kernel/sysctl.c+4 -40 replies
2/23sysctl: Stop using binary sysctl numbers in arlan.drivers/net/wireless/arlan-proc.c+69 -1121 reply
3/23sysctl: Reduce sys_sysctl to a compatibility wrapper around /proc/sysinit/Kconfig kernel/sysctl_binary.c+1384 -1020 replies
4/23sysctl: Neuter the generic sysctl strategy routines.kernel/sysctl.c+0 -1980 replies
5/23sysctl: Remove dead code from sysctl_checkkernel/sysctl_check.c lib/Kconfig.debug+4 -13740 replies
6/23sysctl: Remove references to ctl_name and strategy from the generic sysctl tablekernel/sysctl.c+7 -1880 replies
7/23sysctl: Don't look at ctl_name and strategy in the generic codefs/proc/proc_sysctl.c include/linux/sysctl.h kernel/sysctl.c+11 -390 replies
8/23sysctl ipc: Remove dead binary sysctl support code.ipc/ipc_sysctl.c ipc/mq_sysctl.c+3 -810 replies
9/23sysctl net: Remove unused binary sysctl codeinclude/net/dn_dev.h include/net/neighbour.h net/802/tr.c +59 more+162 -11300 replies
10/23sysctl fs: Remove dead binary sysctl supportfs/coda/sysctl.c fs/eventpoll.c fs/lockd/svc.c +6 more+15 -910 replies
11/23sysctl kernel: Remove binary sysctl logickernel/sched.c kernel/slow-work.c kernel/utsname_sysctl.c+3 -380 replies
12/23sysctl security/keys: Remove dead binary sysctl supportsecurity/keys/sysctl.c+1 -60 replies
13/23sysctl crypto: Remove dead binary sysctl supportcrypto/proc.c+2 -81 reply
14/23sysctl drivers: Remove dead binary sysctl supportdrivers/cdrom/cdrom.c drivers/char/hpet.c drivers/char/ipmi/ipmi_poweroff.c +7 more+27 -1011 reply
15/23sysctl mips/lasat: Remove dead binary sysctl supportarch/mips/lasat/sysctl.c+1 -981 reply
16/23sysctl frv: Remove dead binary sysctl supportarch/frv/kernel/pm.c arch/frv/kernel/sysctl.c+2 -1070 replies
17/23sysctl s390: Remove dead sysctl binary supportarch/s390/kernel/debug.c arch/s390/mm/cmm.c drivers/s390/char/sclp_async.c+6 -130 replies
18/23sysctl ia64: Remove dead binary sysctl supportarch/ia64/kernel/crash.c arch/ia64/kernel/perfmon.c drivers/misc/sgi-xp/xpc_main.c+2 -190 replies
19/23sysctl powerpc: Remove dead binary sysctl supportarch/powerpc/kernel/idle.c+0 -21 reply
20/23sysctl sh: Remove dead binary sysctl supportarch/sh/kernel/traps_64.c+1 -60 replies
21/23sysctl x86: Remove dead binary sysctl supportarch/x86/kernel/vsyscall_64.c arch/x86/vdso/vdso32-setup.c+1 -20 replies
22/23sysctl arm: Remove binary sysctl supportarch/arm/kernel/isa.c arch/arm/mach-bcmring/arch.c+3 -1422 replies
23/23sysctl: Remove the last of the generic binary sysctl supportinclude/linux/sysctl.h kernel/sysctl.c+0 -470 replies

Reviews trailers per patch

4 of 23 patches have a Reviewed-by or Acked-by.

PatchHerbert XuBenjamin HerrenschmidtClemens LadischRalf Baechle
1/23
2/23
3/23
4/23
5/23
6/23
7/23
8/23
9/23
10/23
11/23
12/23
13/23A-b
14/23A-b
15/23A-b
16/23
17/23
18/23
19/23A-b
20/23
21/23
22/23
23/23

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v1 thread

Cover letter [PATCH 00/23] Removal of binary sysctl support

This patchset reimplements sys_sysctl as a compatibility wrapper around /proc/sys. After which it removes all of the code to all over the kernel that is used today to implement the binary sysctls.

I am posting this patchset to give everyone a heads up what is in flight.

I intend to carry all of these patches in my sysctl tree.

If you add new sysctls to other trees please don't set the .ctl_name or .strategy fields in struct ctl_table, as setting those fields is unnecessary now and are removed by this patchset.

Last I looked at linux-next is only one new sysctl that is not in Linus's tree under net/ipv6. David I will send you a patch in a bit to remove the unnecessary .ctl_name = CTL_UNNUMBERED line so that linux-next continues to compile when my tree makes it there.

For your amusement the diffstat of this whole set of changes:

 arch/arm/kernel/isa.c                          |   11 +-
 arch/arm/mach-bcmring/arch.c                   |    6 -
 arch/frv/kernel/pm.c                           |  106 +--
 arch/frv/kernel/sysctl.c                       |    3 -
 arch/ia64/kernel/crash.c                       |    7 +-
 arch/ia64/kernel/perfmon.c                     |    6 -
 arch/mips/lasat/sysctl.c                       |   99 +--
 arch/powerpc/kernel/idle.c                     |    2 -
 arch/s390/kernel/debug.c                       |    9 +-
 arch/s390/mm/cmm.c                             |    5 +-
 arch/sh/kernel/traps_64.c                      |    7 +-
 arch/x86/kernel/vsyscall_64.c                  |    2 +-
 arch/x86/vdso/vdso32-setup.c                   |    1 -
 crypto/proc.c                                  |   10 +-
 drivers/cdrom/cdrom.c                          |    8 +-
 drivers/char/hpet.c                            |    9 +-
 drivers/char/ipmi/ipmi_poweroff.c              |    9 +-
 drivers/char/pty.c                             |   10 +-
 drivers/char/random.c                          |   42 +-
 drivers/char/rtc.c                             |    9 +-
 drivers/macintosh/mac_hid.c                    |   11 +-
 drivers/md/md.c                                |   10 +-
 drivers/misc/sgi-xp/xpc_main.c                 |    8 -
 drivers/net/wireless/arlan-proc.c              |  181 ++--
 drivers/parport/procfs.c                       |   11 +-
 drivers/s390/char/sclp_async.c                 |    5 +-
 drivers/scsi/scsi_sysctl.c                     |    9 +-
 fs/coda/sysctl.c                               |    4 -
 fs/eventpoll.c                                 |    2 +-
 fs/lockd/svc.c                                 |   14 +-
 fs/nfs/sysctl.c                                |   14 +-
 fs/notify/inotify/inotify_user.c               |    8 +-
 fs/ntfs/sysctl.c                               |    2 -
 fs/ocfs2/stackglue.c                           |   13 +-
 fs/proc/proc_sysctl.c                          |    4 +-
 fs/quota/dquot.c                               |   17 +-
 fs/xfs/linux-2.6/xfs_sysctl.c                  |   32 -
 include/linux/sysctl.h                         |   20 +-
 include/net/dn_dev.h                           |    1 -
 include/net/neighbour.h                        |    3 +-
 init/Kconfig                                   |    1 +
 ipc/ipc_sysctl.c                               |   77 --
 ipc/mq_sysctl.c                                |    7 +-
 kernel/sched.c                                 |    5 +-
 kernel/slow-work.c                             |    5 +-
 kernel/sysctl.c                                |  462 +-------
 kernel/sysctl_binary.c                         | 1485 ++++++++++++++++++++++--
 kernel/sysctl_check.c                          | 1376 +----------------------
 kernel/utsname_sysctl.c                        |   31 -
 lib/Kconfig.debug                              |    2 +-
 net/802/tr.c                                   |    7 +-
 net/appletalk/sysctl_net_atalk.c               |   13 +-
 net/ax25/sysctl_net_ax25.c                     |   38 +-
 net/bridge/br_netfilter.c                      |    6 +-
 net/core/neighbour.c                           |   47 +-
 net/core/sysctl_net_core.c                     |   21 +-
 net/dccp/sysctl.c                              |    8 +-
 net/decnet/dn_dev.c                            |   64 +-
 net/decnet/sysctl_net_decnet.c                 |  124 +--
 net/ipv4/arp.c                                 |    2 +-
 net/ipv4/devinet.c                             |  111 +--
 net/ipv4/ip_fragment.c                         |    6 -
 net/ipv4/netfilter.c                           |    6 +-
 net/ipv4/netfilter/ip_queue.c                  |    3 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |   10 +-
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c   |    8 +-
 net/ipv4/route.c                               |   73 +-
 net/ipv4/sysctl_net_ipv4.c                     |  164 +---
 net/ipv4/xfrm4_policy.c                        |    1 -
 net/ipv6/addrconf.c                            |   90 +--
 net/ipv6/icmp.c                                |    4 +-
 net/ipv6/ndisc.c                               |   39 +-
 net/ipv6/netfilter/ip6_queue.c                 |    4 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c |    4 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c        |    4 +-
 net/ipv6/reassembly.c                          |    6 -
 net/ipv6/route.c                               |   18 +-
 net/ipv6/sysctl_net_ipv6.c                     |   12 +-
 net/ipv6/xfrm6_policy.c                        |    1 -
 net/ipx/sysctl_net_ipx.c                       |    7 +-
 net/irda/irsysctl.c                            |   31 +-
 net/llc/sysctl_net_llc.c                       |   25 +-
 net/netfilter/core.c                           |    4 +-
 net/netfilter/ipvs/ip_vs_ctl.c                 |    6 +-
 net/netfilter/ipvs/ip_vs_lblc.c                |    2 +-
 net/netfilter/ipvs/ip_vs_lblcr.c               |    2 +-
 net/netfilter/nf_conntrack_acct.c              |    1 -
 net/netfilter/nf_conntrack_ecache.c            |    2 -
 net/netfilter/nf_conntrack_proto_dccp.c        |   12 +-
 net/netfilter/nf_conntrack_proto_generic.c     |    8 +-
 net/netfilter/nf_conntrack_proto_sctp.c        |    8 +-
 net/netfilter/nf_conntrack_proto_tcp.c         |   14 +-
 net/netfilter/nf_conntrack_proto_udp.c         |    8 +-
 net/netfilter/nf_conntrack_proto_udplite.c     |    6 +-
 net/netfilter/nf_conntrack_standalone.c        |   14 +-
 net/netfilter/nf_log.c                         |    7 +-
 net/netrom/sysctl_net_netrom.c                 |   30 +-
 net/phonet/sysctl.c                            |    8 +-
 net/rds/ib_sysctl.c                            |   14 +-
 net/rds/iw_sysctl.c                            |   14 +-
 net/rds/sysctl.c                               |   11 +-
 net/rose/sysctl_net_rose.c                     |   26 +-
 net/sctp/sysctl.c                              |   49 +-
 net/sunrpc/sysctl.c                            |    5 +-
 net/sunrpc/xprtrdma/svc_rdma.c                 |   16 +-
 net/sunrpc/xprtrdma/transport.c                |   20 +-
 net/sunrpc/xprtsock.c                          |   18 +-
 net/unix/sysctl_net_unix.c                     |    7 +-
 net/x25/sysctl_net_x25.c                       |   15 +-
 net/xfrm/xfrm_sysctl.c                         |    4 -
 security/keys/sysctl.c                         |    7 +-
 111 files changed, 1702 insertions(+), 3774 deletions(-)

Eric