treewide: use kv[mz]alloc* rather than opencoded variants

There are many code paths opencoding kvmalloc.  Let's use the helper
instead.  The main difference to kvmalloc is that those users are
usually not considering all the aspects of the memory allocator.  E.g.
allocation requests <= 32kB (with 4kB pages) are basically never failing
and invoke OOM killer to satisfy the allocation.  This sounds too
disruptive for something that has a reasonable fallback - the vmalloc.
On the other hand those requests might fallback to vmalloc even when the
memory allocator would succeed after several more reclaim/compaction
attempts previously.  There is no guarantee something like that happens
though.

This patch converts many of those places to kv[mz]alloc* helpers because
they are more conservative.

Link: http://lkml.kernel.org/r/20170306103327.2766-2-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> # Xen bits
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Andreas Dilger <andreas.dilger@intel.com> # Lustre
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> # KVM/s390
Acked-by: Dan Williams <dan.j.williams@intel.com> # nvdim
Acked-by: David Sterba <dsterba@suse.com> # btrfs
Acked-by: Ilya Dryomov <idryomov@gmail.com> # Ceph
Acked-by: Tariq Toukan <tariqt@mellanox.com> # mlx4
Acked-by: Leon Romanovsky <leonro@mellanox.com> # mlx5
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Santosh Raspatur <santosh@chelsio.com>
Cc: Hariprasad S <hariprasad@chelsio.com>
Cc: Yishai Hadas <yishaih@mellanox.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: "Yan, Zheng" <zyan@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 24 deletions

diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c
index c19d346e6c5a..51d3ba682af9 100644
--- a/net/sched/sch_hhf.c
+++ b/net/sched/sch_hhf.c
@@ -467,29 +467,14 @@ static void hhf_reset(struct Qdisc *sch)
                 rtnl_kfree_skbs(skb, skb);
 }
 
-static void *hhf_zalloc(size_t sz)
-{
-        void *ptr = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN);
-
-        if (!ptr)
-                ptr = vzalloc(sz);
-
-        return ptr;
-}
-
-static void hhf_free(void *addr)
-{
-        kvfree(addr);
-}
-
 static void hhf_destroy(struct Qdisc *sch)
 {
         int i;
         struct hhf_sched_data *q = qdisc_priv(sch);
 
         for (i = 0; i < HHF_ARRAYS_CNT; i++) {
-                hhf_free(q->hhf_arrays[i]);
-                hhf_free(q->hhf_valid_bits[i]);
+                kvfree(q->hhf_arrays[i]);
+                kvfree(q->hhf_valid_bits[i]);
         }
 
         for (i = 0; i < HH_FLOWS_CNT; i++) {
@@ -503,7 +488,7 @@ static void hhf_destroy(struct Qdisc *sch)
                         kfree(flow);
                 }
         }
-        hhf_free(q->hh_flows);
+        kvfree(q->hh_flows);
 }
 
 static const struct nla_policy hhf_policy[TCA_HHF_MAX + 1] = {
@@ -609,8 +594,8 @@ static int hhf_init(struct Qdisc *sch, struct nlattr *opt)
 
         if (!q->hh_flows) {
                 /* Initialize heavy-hitter flow table. */
-                q->hh_flows = hhf_zalloc(HH_FLOWS_CNT *
-                                         sizeof(struct list_head));
+                q->hh_flows = kvzalloc(HH_FLOWS_CNT *
+                                         sizeof(struct list_head), GFP_KERNEL);
                 if (!q->hh_flows)
                         return -ENOMEM;
                 for (i = 0; i < HH_FLOWS_CNT; i++)
@@ -624,8 +609,8 @@ static int hhf_init(struct Qdisc *sch, struct nlattr *opt)
 
                 /* Initialize heavy-hitter filter arrays. */
                 for (i = 0; i < HHF_ARRAYS_CNT; i++) {
-                        q->hhf_arrays[i] = hhf_zalloc(HHF_ARRAYS_LEN *
-                                                      sizeof(u32));
+                        q->hhf_arrays[i] = kvzalloc(HHF_ARRAYS_LEN *
+                                                      sizeof(u32), GFP_KERNEL);
                         if (!q->hhf_arrays[i]) {
                                 /* Note: hhf_destroy() will be called
                                  * by our caller.
@@ -637,8 +622,8 @@ static int hhf_init(struct Qdisc *sch, struct nlattr *opt)
 
                 /* Initialize valid bits of heavy-hitter filter arrays. */
                 for (i = 0; i < HHF_ARRAYS_CNT; i++) {
-                        q->hhf_valid_bits[i] = hhf_zalloc(HHF_ARRAYS_LEN /
-                                                          BITS_PER_BYTE);
+                        q->hhf_valid_bits[i] = kvzalloc(HHF_ARRAYS_LEN /
+                                                          BITS_PER_BYTE, GFP_KERNEL);
                         if (!q->hhf_valid_bits[i]) {
                                 /* Note: hhf_destroy() will be called
                                  * by our caller.