Merge branch 'akpm' (patches from Andrew)

Merge third patch-bomb from Andrew Morton:
 "I'm pretty much done for -rc1 now:

   - the rest of MM, basically

   - lib/ updates

   - checkpatch, epoll, hfs, fatfs, ptrace, coredump, exit

   - cpu_mask simplifications

   - kexec, rapidio, MAINTAINERS etc, etc.

   - more dma-mapping cleanups/simplifications from hch"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits)
  MAINTAINERS: add/fix git URLs for various subsystems
  mm: memcontrol: add "sock" to cgroup2 memory.stat
  mm: memcontrol: basic memory statistics in cgroup2 memory controller
  mm: memcontrol: do not uncharge old page in page cache replacement
  Documentation: cgroup: add memory.swap.{current,max} description
  mm: free swap cache aggressively if memcg swap is full
  mm: vmscan: do not scan anon pages if memcg swap limit is hit
  swap.h: move memcg related stuff to the end of the file
  mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
  mm: vmscan: pass memcg to get_scan_count()
  mm: memcontrol: charge swap to cgroup2
  mm: memcontrol: clean up alloc, online, offline, free functions
  mm: memcontrol: flatten struct cg_proto
  mm: memcontrol: rein in the CONFIG space madness
  net: drop tcp_memcontrol.c
  mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
  mm: memcontrol: allow to disable kmem accounting for cgroup2
  mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
  mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
  mm: memcontrol: separate kmem code from legacy tcp accounting code
  ...

6 files changed, 2 insertions, 209 deletions

diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index c29809f765dc..62c049b647e9 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
 obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
 obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
 obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
-obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
 obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
 
 obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 46ce410703b1..4d367b4139a3 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -24,7 +24,6 @@
 #include <net/cipso_ipv4.h>
 #include <net/inet_frag.h>
 #include <net/ping.h>
-#include <net/tcp_memcontrol.h>
 
 static int zero;
 static int one = 1;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index c7d1fb50f381..5ced3e4013e3 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -73,7 +73,6 @@
 #include <net/timewait_sock.h>
 #include <net/xfrm.h>
 #include <net/secure_seq.h>
-#include <net/tcp_memcontrol.h>
 #include <net/busy_poll.h>
 
 #include <linux/inet.h>
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
deleted file mode 100644
index 18bc7f745e9c..000000000000
--- a/net/ipv4/tcp_memcontrol.c
+++ /dev/null
@@ -1,200 +0,0 @@
-#include <net/tcp.h>
-#include <net/tcp_memcontrol.h>
-#include <net/sock.h>
-#include <net/ip.h>
-#include <linux/nsproxy.h>
-#include <linux/memcontrol.h>
-#include <linux/module.h>
-
-int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
-{
-        struct mem_cgroup *parent = parent_mem_cgroup(memcg);
-        struct page_counter *counter_parent = NULL;
-        /*
-         * The root cgroup does not use page_counters, but rather,
-         * rely on the data already collected by the network
-         * subsystem
-         */
-        if (memcg == root_mem_cgroup)
-                return 0;
-
-        memcg->tcp_mem.memory_pressure = 0;
-
-        if (parent)
-                counter_parent = &parent->tcp_mem.memory_allocated;
-
-        page_counter_init(&memcg->tcp_mem.memory_allocated, counter_parent);
-
-        return 0;
-}
-
-void tcp_destroy_cgroup(struct mem_cgroup *memcg)
-{
-        if (memcg == root_mem_cgroup)
-                return;
-
-        if (memcg->tcp_mem.active)
-                static_branch_dec(&memcg_sockets_enabled_key);
-}
-
-static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
-{
-        int ret;
-
-        if (memcg == root_mem_cgroup)
-                return -EINVAL;
-
-        ret = page_counter_limit(&memcg->tcp_mem.memory_allocated, nr_pages);
-        if (ret)
-                return ret;
-
-        if (!memcg->tcp_mem.active) {
-                /*
-                 * The active flag needs to be written after the static_key
-                 * update. This is what guarantees that the socket activation
-                 * function is the last one to run. See sock_update_memcg() for
-                 * details, and note that we don't mark any socket as belonging
-                 * to this memcg until that flag is up.
-                 *
-                 * We need to do this, because static_keys will span multiple
-                 * sites, but we can't control their order. If we mark a socket
-                 * as accounted, but the accounting functions are not patched in
-                 * yet, we'll lose accounting.
-                 *
-                 * We never race with the readers in sock_update_memcg(),
-                 * because when this value change, the code to process it is not
-                 * patched in yet.
-                 */
-                static_branch_inc(&memcg_sockets_enabled_key);
-                memcg->tcp_mem.active = true;
-        }
-
-        return 0;
-}
-
-enum {
-        RES_USAGE,
-        RES_LIMIT,
-        RES_MAX_USAGE,
-        RES_FAILCNT,
-};
-
-static DEFINE_MUTEX(tcp_limit_mutex);
-
-static ssize_t tcp_cgroup_write(struct kernfs_open_file *of,
-                                char *buf, size_t nbytes, loff_t off)
-{
-        struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of));
-        unsigned long nr_pages;
-        int ret = 0;
-
-        buf = strstrip(buf);
-
-        switch (of_cft(of)->private) {
-        case RES_LIMIT:
-                /* see memcontrol.c */
-                ret = page_counter_memparse(buf, "-1", &nr_pages);
-                if (ret)
-                        break;
-                mutex_lock(&tcp_limit_mutex);
-                ret = tcp_update_limit(memcg, nr_pages);
-                mutex_unlock(&tcp_limit_mutex);
-                break;
-        default:
-                ret = -EINVAL;
-                break;
-        }
-        return ret ?: nbytes;
-}
-
-static u64 tcp_cgroup_read(struct cgroup_subsys_state *css, struct cftype *cft)
-{
-        struct mem_cgroup *memcg = mem_cgroup_from_css(css);
-        u64 val;
-
-        switch (cft->private) {
-        case RES_LIMIT:
-                if (memcg == root_mem_cgroup)
-                        val = PAGE_COUNTER_MAX;
-                else
-                        val = memcg->tcp_mem.memory_allocated.limit;
-                val *= PAGE_SIZE;
-                break;
-        case RES_USAGE:
-                if (memcg == root_mem_cgroup)
-                        val = atomic_long_read(&tcp_memory_allocated);
-                else
-                        val = page_counter_read(&memcg->tcp_mem.memory_allocated);
-                val *= PAGE_SIZE;
-                break;
-        case RES_FAILCNT:
-                if (memcg == root_mem_cgroup)
-                        return 0;
-                val = memcg->tcp_mem.memory_allocated.failcnt;
-                break;
-        case RES_MAX_USAGE:
-                if (memcg == root_mem_cgroup)
-                        return 0;
-                val = memcg->tcp_mem.memory_allocated.watermark;
-                val *= PAGE_SIZE;
-                break;
-        default:
-                BUG();
-        }
-        return val;
-}
-
-static ssize_t tcp_cgroup_reset(struct kernfs_open_file *of,
-                                char *buf, size_t nbytes, loff_t off)
-{
-        struct mem_cgroup *memcg;
-
-        memcg = mem_cgroup_from_css(of_css(of));
-        if (memcg == root_mem_cgroup)
-                return nbytes;
-
-        switch (of_cft(of)->private) {
-        case RES_MAX_USAGE:
-                page_counter_reset_watermark(&memcg->tcp_mem.memory_allocated);
-                break;
-        case RES_FAILCNT:
-                memcg->tcp_mem.memory_allocated.failcnt = 0;
-                break;
-        }
-
-        return nbytes;
-}
-
-static struct cftype tcp_files[] = {
-        {
-                .name = "kmem.tcp.limit_in_bytes",
-                .write = tcp_cgroup_write,
-                .read_u64 = tcp_cgroup_read,
-                .private = RES_LIMIT,
-        },
-        {
-                .name = "kmem.tcp.usage_in_bytes",
-                .read_u64 = tcp_cgroup_read,
-                .private = RES_USAGE,
-        },
-        {
-                .name = "kmem.tcp.failcnt",
-                .private = RES_FAILCNT,
-                .write = tcp_cgroup_reset,
-                .read_u64 = tcp_cgroup_read,
-        },
-        {
-                .name = "kmem.tcp.max_usage_in_bytes",
-                .private = RES_MAX_USAGE,
-                .write = tcp_cgroup_reset,
-                .read_u64 = tcp_cgroup_read,
-        },
-        { }     /* terminate */
-};
-
-static int __init tcp_memcontrol_init(void)
-{
-        WARN_ON(cgroup_add_legacy_cftypes(&memory_cgrp_subsys, tcp_files));
-        return 0;
-}
-__initcall(tcp_memcontrol_init);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 4ad8edb46f7c..006396e31cb0 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -61,7 +61,6 @@
 #include <net/timewait_sock.h>
 #include <net/inet_common.h>
 #include <net/secure_seq.h>
-#include <net/tcp_memcontrol.h>
 #include <net/busy_poll.h>
 
 #include <linux/proc_fs.h>
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index abbdff03ce92..3e24d0ddb51b 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -91,7 +91,7 @@ static const struct file_operations reset_ops = {
 };
 #endif
 
-static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {
+static const char *hw_flag_names[] = {
 #define FLAG(F) [IEEE80211_HW_##F] = #F
         FLAG(HAS_RATE_CONTROL),
         FLAG(RX_INCLUDES_FCS),
@@ -126,9 +126,6 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {
         FLAG(SUPPORTS_AMSDU_IN_AMPDU),
         FLAG(BEACON_TX_STATUS),
         FLAG(NEEDS_UNIQUE_STA_ADDR),
-
-        /* keep last for the build bug below */
-        (void *)0x1
 #undef FLAG
 };
 
@@ -148,7 +145,7 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
         /* fail compilation if somebody adds or removes
          * a flag without updating the name array above
          */
-        BUILD_BUG_ON(hw_flag_names[NUM_IEEE80211_HW_FLAGS] != (void *)0x1);
+        BUILD_BUG_ON(ARRAY_SIZE(hw_flag_names) != NUM_IEEE80211_HW_FLAGS);
 
         for (i = 0; i < NUM_IEEE80211_HW_FLAGS; i++) {
                 if (test_bit(i, local->hw.flags))