target/linux/generic/hack-4.14/902-debloat_proc.patch

   1 From 9e3f1d0805b2d919904dd9a4ff0d956314cc3cba Mon Sep 17 00:00:00 2001
   2 From: Felix Fietkau <nbd@nbd.name>
   3 Date: Sat, 8 Jul 2017 08:20:09 +0200
   4 Subject: debloat: procfs
   5
   6 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   7 ---
   8  fs/locks.c               |  2 ++
   9  fs/proc/Kconfig          |  5 +++++
  10  fs/proc/consoles.c       |  3 +++
  11  fs/proc/proc_tty.c       | 11 ++++++++++-
  12  include/net/snmp.h       | 18 +++++++++++++++++-
  13  ipc/msg.c                |  3 +++
  14  ipc/sem.c                |  2 ++
  15  ipc/shm.c                |  2 ++
  16  ipc/util.c               |  3 +++
  17  kernel/exec_domain.c     |  2 ++
  18  kernel/irq/proc.c        |  9 +++++++++
  19  kernel/time/timer_list.c |  2 ++
  20  mm/vmalloc.c             |  2 ++
  21  mm/vmstat.c              |  8 +++++---
  22  net/8021q/vlanproc.c     |  6 ++++++
  23  net/core/net-procfs.c    | 18 ++++++++++++------
  24  net/core/sock.c          |  2 ++
  25  net/ipv4/fib_trie.c      | 18 ++++++++++++------
  26  net/ipv4/proc.c          |  3 +++
  27  net/ipv4/route.c         |  3 +++
  28  20 files changed, 105 insertions(+), 17 deletions(-)
  29
  30 --- a/fs/locks.c
  31 +++ b/fs/locks.c
  32 @@ -2812,6 +2812,8 @@ static const struct file_operations proc
  33
  34  static int __init proc_locks_init(void)
  35  {
  36 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
  37 +               return 0;
  38         proc_create("locks", 0, NULL, &proc_locks_operations);
  39         return 0;
  40  }
  41 --- a/fs/proc/Kconfig
  42 +++ b/fs/proc/Kconfig
  43 @@ -81,3 +81,8 @@ config PROC_CHILDREN
  44
  45           Say Y if you are running any user-space software which takes benefit from
  46           this interface. For example, rkt is such a piece of software.
  47 +
  48 +config PROC_STRIPPED
  49 +       default n
  50 +       depends on EXPERT
  51 +       bool "Strip non-essential /proc functionality to reduce code size"
  52 --- a/fs/proc/consoles.c
  53 +++ b/fs/proc/consoles.c
  54 @@ -106,6 +106,9 @@ static const struct file_operations proc
  55
  56  static int __init proc_consoles_init(void)
  57  {
  58 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
  59 +               return 0;
  60 +
  61         proc_create("consoles", 0, NULL, &proc_consoles_operations);
  62         return 0;
  63  }
  64 --- a/fs/proc/proc_tty.c
  65 +++ b/fs/proc/proc_tty.c
  66 @@ -145,7 +145,10 @@ static const struct file_operations proc
  67  void proc_tty_register_driver(struct tty_driver *driver)
  68  {
  69         struct proc_dir_entry *ent;
  70 -
  71 +
  72 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
  73 +               return;
  74 +
  75         if (!driver->driver_name || driver->proc_entry ||
  76             !driver->ops->proc_fops)
  77                 return;
  78 @@ -162,6 +165,9 @@ void proc_tty_unregister_driver(struct t
  79  {
  80         struct proc_dir_entry *ent;
  81
  82 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
  83 +               return;
  84 +
  85         ent = driver->proc_entry;
  86         if (!ent)
  87                 return;
  88 @@ -176,6 +182,9 @@ void proc_tty_unregister_driver(struct t
  89   */
  90  void __init proc_tty_init(void)
  91  {
  92 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
  93 +               return;
  94 +
  95         if (!proc_mkdir("tty", NULL))
  96                 return;
  97         proc_mkdir("tty/ldisc", NULL);  /* Preserved: it's userspace visible */
  98 --- a/include/net/snmp.h
  99 +++ b/include/net/snmp.h
 100 @@ -123,6 +123,21 @@ struct linux_xfrm_mib {
 101  #define DECLARE_SNMP_STAT(type, name)  \
 102         extern __typeof__(type) __percpu *name
 103
 104 +#ifdef CONFIG_PROC_STRIPPED
 105 +#define __SNMP_STATS_DUMMY(mib)        \
 106 +       do { (void) mib->mibs[0]; } while(0)
 107 +
 108 +#define __SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
 109 +#define SNMP_INC_STATS_ATOMIC_LONG(mib, field) __SNMP_STATS_DUMMY(mib)
 110 +#define SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
 111 +#define SNMP_DEC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
 112 +#define __SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
 113 +#define SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
 114 +#define SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
 115 +#define __SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
 116 +
 117 +#else
 118 +
 119  #define __SNMP_INC_STATS(mib, field)   \
 120                         __this_cpu_inc(mib->mibs[field])
 121
 122 @@ -153,8 +168,9 @@ struct linux_xfrm_mib {
 123                 __this_cpu_add(ptr[basefield##OCTETS], addend); \
 124         } while (0)
 125
 126 +#endif
 127
 128 -#if BITS_PER_LONG==32
 129 +#if (BITS_PER_LONG==32) && !defined(CONFIG_PROC_STRIPPED)
 130
 131  #define __SNMP_ADD_STATS64(mib, field, addend)                                 \
 132         do {                                                            \
 133 --- a/ipc/msg.c
 134 +++ b/ipc/msg.c
 135 @@ -1208,6 +1208,9 @@ int __init msg_init(void)
 136  {
 137         const int err = msg_init_ns(&init_ipc_ns);
 138
 139 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 140 +               return err;
 141 +
 142         ipc_init_proc_interface("sysvipc/msg",
 143                                 "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
 144                                 IPC_MSG_IDS, sysvipc_msg_proc_show);
 145 --- a/ipc/sem.c
 146 +++ b/ipc/sem.c
 147 @@ -207,6 +207,8 @@ int __init sem_init(void)
 148  {
 149         const int err = sem_init_ns(&init_ipc_ns);
 150
 151 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 152 +               return err;
 153         ipc_init_proc_interface("sysvipc/sem",
 154                                 "       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
 155                                 IPC_SEM_IDS, sysvipc_sem_proc_show);
 156 --- a/ipc/shm.c
 157 +++ b/ipc/shm.c
 158 @@ -122,6 +122,8 @@ pure_initcall(ipc_ns_init);
 159
 160  void __init shm_init(void)
 161  {
 162 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 163 +               return;
 164         ipc_init_proc_interface("sysvipc/shm",
 165  #if BITS_PER_LONG <= 32
 166                                 "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
 167 --- a/ipc/util.c
 168 +++ b/ipc/util.c
 169 @@ -141,6 +141,9 @@ void __init ipc_init_proc_interface(cons
 170         struct proc_dir_entry *pde;
 171         struct ipc_proc_iface *iface;
 172
 173 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 174 +               return;
 175 +
 176         iface = kmalloc(sizeof(*iface), GFP_KERNEL);
 177         if (!iface)
 178                 return;
 179 --- a/kernel/exec_domain.c
 180 +++ b/kernel/exec_domain.c
 181 @@ -42,6 +42,8 @@ static const struct file_operations exec
 182
 183  static int __init proc_execdomains_init(void)
 184  {
 185 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 186 +               return 0;
 187         proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
 188         return 0;
 189  }
 190 --- a/kernel/irq/proc.c
 191 +++ b/kernel/irq/proc.c
 192 @@ -396,6 +396,9 @@ void register_irq_proc(unsigned int irq,
 193         void __maybe_unused *irqp = (void *)(unsigned long) irq;
 194         char name [MAX_NAMELEN];
 195
 196 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 197 +               return;
 198 +
 199         if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip))
 200                 return;
 201
 202 @@ -449,6 +452,9 @@ void unregister_irq_proc(unsigned int ir
 203  {
 204         char name [MAX_NAMELEN];
 205
 206 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 207 +               return;
 208 +
 209         if (!root_irq_dir || !desc->dir)
 210                 return;
 211  #ifdef CONFIG_SMP
 212 @@ -487,6 +493,9 @@ void init_irq_proc(void)
 213         unsigned int irq;
 214         struct irq_desc *desc;
 215
 216 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
 217 +               return;
 218 +
 219         /* create /proc/irq */
 220         root_irq_dir = proc_mkdir("irq", NULL);
 221         if (!root_irq_dir)
 222 --- a/kernel/time/timer_list.c
 223 +++ b/kernel/time/timer_list.c
 224 @@ -389,6 +389,9 @@ static int __init init_timer_list_procfs
 225  {
 226         struct proc_dir_entry *pe;
 227
 228 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 229 +               return 0;
 230 +
 231         pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
 232         if (!pe)
 233                 return -ENOMEM;
 234 --- a/mm/vmalloc.c
 235 +++ b/mm/vmalloc.c
 236 @@ -2770,6 +2770,8 @@ static const struct file_operations proc
 237
 238  static int __init proc_vmalloc_init(void)
 239  {
 240 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 241 +               return 0;
 242         proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
 243         return 0;
 244  }
 245 --- a/mm/vmstat.c
 246 +++ b/mm/vmstat.c
 247 @@ -1955,10 +1955,12 @@ void __init init_mm_internals(void)
 248         start_shepherd_timer();
 249  #endif
 250  #ifdef CONFIG_PROC_FS
 251 -       proc_create("buddyinfo", 0444, NULL, &buddyinfo_file_operations);
 252 -       proc_create("pagetypeinfo", 0444, NULL, &pagetypeinfo_file_operations);
 253 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
 254 +               proc_create("buddyinfo", 0444, NULL, &buddyinfo_file_operations);
 255 +               proc_create("pagetypeinfo", 0444, NULL, &pagetypeinfo_file_operations);
 256 +               proc_create("zoneinfo", 0444, NULL, &zoneinfo_file_operations);
 257 +       }
 258         proc_create("vmstat", 0444, NULL, &vmstat_file_operations);
 259 -       proc_create("zoneinfo", 0444, NULL, &zoneinfo_file_operations);
 260  #endif
 261  }
 262
 263 --- a/net/8021q/vlanproc.c
 264 +++ b/net/8021q/vlanproc.c
 265 @@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net)
 266  {
 267         struct vlan_net *vn = net_generic(net, vlan_net_id);
 268
 269 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 270 +               return;
 271 +
 272         if (vn->proc_vlan_conf)
 273                 remove_proc_entry(name_conf, vn->proc_vlan_dir);
 274
 275 @@ -146,6 +149,9 @@ int __net_init vlan_proc_init(struct net
 276  {
 277         struct vlan_net *vn = net_generic(net, vlan_net_id);
 278
 279 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 280 +               return 0;
 281 +
 282         vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
 283         if (!vn->proc_vlan_dir)
 284                 goto err;
 285 --- a/net/core/net-procfs.c
 286 +++ b/net/core/net-procfs.c
 287 @@ -320,10 +320,12 @@ static int __net_init dev_proc_net_init(
 288
 289         if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops))
 290                 goto out;
 291 -       if (!proc_create("softnet_stat", S_IRUGO, net->proc_net,
 292 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
 293 +               !proc_create("softnet_stat", S_IRUGO, net->proc_net,
 294                          &softnet_seq_fops))
 295                 goto out_dev;
 296 -       if (!proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
 297 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
 298 +               !proc_create("ptype", S_IRUGO, net->proc_net, &ptype_seq_fops))
 299                 goto out_softnet;
 300
 301         if (wext_proc_init(net))
 302 @@ -332,9 +334,11 @@ static int __net_init dev_proc_net_init(
 303  out:
 304         return rc;
 305  out_ptype:
 306 -       remove_proc_entry("ptype", net->proc_net);
 307 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
 308 +               remove_proc_entry("ptype", net->proc_net);
 309  out_softnet:
 310 -       remove_proc_entry("softnet_stat", net->proc_net);
 311 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
 312 +               remove_proc_entry("softnet_stat", net->proc_net);
 313  out_dev:
 314         remove_proc_entry("dev", net->proc_net);
 315         goto out;
 316 @@ -344,8 +348,10 @@ static void __net_exit dev_proc_net_exit
 317  {
 318         wext_proc_exit(net);
 319
 320 -       remove_proc_entry("ptype", net->proc_net);
 321 -       remove_proc_entry("softnet_stat", net->proc_net);
 322 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
 323 +               remove_proc_entry("ptype", net->proc_net);
 324 +               remove_proc_entry("softnet_stat", net->proc_net);
 325 +       }
 326         remove_proc_entry("dev", net->proc_net);
 327  }
 328
 329 --- a/net/core/sock.c
 330 +++ b/net/core/sock.c
 331 @@ -3381,6 +3381,8 @@ static __net_initdata struct pernet_oper
 332
 333  static int __init proto_init(void)
 334  {
 335 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 336 +               return 0;
 337         return register_pernet_subsys(&proto_net_ops);
 338  }
 339
 340 --- a/net/ipv4/fib_trie.c
 341 +++ b/net/ipv4/fib_trie.c
 342 @@ -2731,10 +2731,12 @@ static const struct file_operations fib_
 343
 344  int __net_init fib_proc_init(struct net *net)
 345  {
 346 -       if (!proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
 347 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
 348 +               !proc_create("fib_trie", S_IRUGO, net->proc_net, &fib_trie_fops))
 349                 goto out1;
 350
 351 -       if (!proc_create("fib_triestat", S_IRUGO, net->proc_net,
 352 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
 353 +               !proc_create("fib_triestat", S_IRUGO, net->proc_net,
 354                          &fib_triestat_fops))
 355                 goto out2;
 356
 357 @@ -2744,17 +2746,21 @@ int __net_init fib_proc_init(struct net
 358         return 0;
 359
 360  out3:
 361 -       remove_proc_entry("fib_triestat", net->proc_net);
 362 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
 363 +               remove_proc_entry("fib_triestat", net->proc_net);
 364  out2:
 365 -       remove_proc_entry("fib_trie", net->proc_net);
 366 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
 367 +               remove_proc_entry("fib_trie", net->proc_net);
 368  out1:
 369         return -ENOMEM;
 370  }
 371
 372  void __net_exit fib_proc_exit(struct net *net)
 373  {
 374 -       remove_proc_entry("fib_trie", net->proc_net);
 375 -       remove_proc_entry("fib_triestat", net->proc_net);
 376 +       if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
 377 +               remove_proc_entry("fib_trie", net->proc_net);
 378 +               remove_proc_entry("fib_triestat", net->proc_net);
 379 +       }
 380         remove_proc_entry("route", net->proc_net);
 381  }
 382
 383 --- a/net/ipv4/proc.c
 384 +++ b/net/ipv4/proc.c
 385 @@ -558,6 +558,9 @@ static __net_initdata struct pernet_oper
 386
 387  int __init ip_misc_proc_init(void)
 388  {
 389 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 390 +               return 0;
 391 +
 392         return register_pernet_subsys(&ip_proc_ops);
 393  }
 394
 395 --- a/net/ipv4/route.c
 396 +++ b/net/ipv4/route.c
 397 @@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr
 398
 399  static int __init ip_rt_proc_init(void)
 400  {
 401 +       if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 402 +               return 0;
 403 +
 404         return register_pernet_subsys(&ip_rt_proc_ops);
 405  }
 406