From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757557AbdAFOhn (ORCPT ); Fri, 6 Jan 2017 09:37:43 -0500 Received: from mx2.suse.de ([195.135.220.15]:52112 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754252AbdAFOgI (ORCPT ); Fri, 6 Jan 2017 09:36:08 -0500 Subject: Re: [PATCH] mm: introduce kv[mz]alloc helpers To: Michal Hocko , Andrew Morton References: <20170102133700.1734-1-mhocko@kernel.org> <20170104142022.GL25453@dhcp22.suse.cz> Cc: David Rientjes , Mel Gorman , Johannes Weiner , Al Viro , linux-mm@kvack.org, LKML , kvm@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, linux-ext4@vger.kernel.org, Joe Perches , Anatoly Stepanov , Paolo Bonzini , Mike Snitzer , "Michael S. Tsirkin" , "Theodore Ts'o" , Andreas Dilger From: Vlastimil Babka Message-ID: <6ab0f90a-4ead-d7a2-74e3-200c49b7d2b3@suse.cz> Date: Fri, 6 Jan 2017 15:36:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170104142022.GL25453@dhcp22.suse.cz> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/04/2017 03:20 PM, Michal Hocko wrote: > diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c > index 2ff499680cc6..0a5cc1237afe 100644 > --- a/net/netfilter/x_tables.c > +++ b/net/netfilter/x_tables.c > @@ -712,17 +712,8 @@ EXPORT_SYMBOL(xt_check_entry_offsets); > */ > unsigned int *xt_alloc_entry_offsets(unsigned int size) > { > - unsigned int *off; > + return kvmalloc(size * sizeof(unsigned int), GFP_KERNEL);; > > - off = kcalloc(size, sizeof(unsigned int), GFP_KERNEL | __GFP_NOWARN); > - > - if (off) > - return off; > - > - if (size < (SIZE_MAX / sizeof(unsigned int))) > - off = vmalloc(size * sizeof(unsigned int)); > - > - return off; This one seems to have tried hard to avoid the multiplication overflow by using kcalloc() and doing the size check before vmalloc(), so I wonder if it's safe to just remove the checks completely? > } > EXPORT_SYMBOL(xt_alloc_entry_offsets); > > diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c > index 86309a3156a5..5678eff40f61 100644 > --- a/net/sched/sch_fq.c > +++ b/net/sched/sch_fq.c > @@ -624,16 +624,6 @@ static void fq_rehash(struct fq_sched_data *q, > q->stat_gc_flows += fcnt; > } > > -static void *fq_alloc_node(size_t sz, int node) > -{ > - void *ptr; > - > - ptr = kmalloc_node(sz, GFP_KERNEL | __GFP_REPEAT | __GFP_NOWARN, node); Another patch 3 material? > - if (!ptr) > - ptr = vmalloc_node(sz, node); > - return ptr; > -} > - > static void fq_free(void *addr) > { > kvfree(addr); > @@ -650,7 +640,7 @@ static int fq_resize(struct Qdisc *sch, u32 log) > return 0; > > /* If XPS was setup, we can allocate memory on right NUMA node */ > - array = fq_alloc_node(sizeof(struct rb_root) << log, > + array = kvmalloc_node(sizeof(struct rb_root) << log, GFP_KERNEL, > netdev_queue_numa_node_read(sch->dev_queue)); > if (!array) > return -ENOMEM; With that fixed, Acked-by: Vlastimil Babka