Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752367AbcD1PEJ (ORCPT ); Thu, 28 Apr 2016 11:04:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59874 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751731AbcD1PEH (ORCPT ); Thu, 28 Apr 2016 11:04:07 -0400 Date: Thu, 28 Apr 2016 11:04:05 -0400 (EDT) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: Michal Hocko cc: Andrew Morton , linux-mm@kvack.org, LKML , Michal Hocko , Shaohua Li , dm-devel@redhat.com Subject: Re: [PATCH] md: simplify free_params for kmalloc vs vmalloc fallback In-Reply-To: <1461855076-1682-1-git-send-email-mhocko@kernel.org> Message-ID: References: <1461849846-27209-20-git-send-email-mhocko@kernel.org> <1461855076-1682-1-git-send-email-mhocko@kernel.org> User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2535 Lines: 75 Acked-by: Mikulas Patocka BTW. we could also use kvmalloc to complement kvfree, proposed here: https://www.redhat.com/archives/dm-devel/2015-July/msg00046.html Mikulas On Thu, 28 Apr 2016, Michal Hocko wrote: > From: Michal Hocko > > Use kvfree rather than DM_PARAMS_[KV]MALLOC specific param flags. > > Cc: Shaohua Li > Cc: Mikulas Patocka > Cc: dm-devel@redhat.com > Signed-off-by: Michal Hocko > --- > Hi, > this is a rebase on top of dropped "dm: clean up GFP_NIO usage" which > should be dropped as per the feedback from Mikulas. > > drivers/md/dm-ioctl.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c > index 2c7ca258c4e4..e66e5b43bc18 100644 > --- a/drivers/md/dm-ioctl.c > +++ b/drivers/md/dm-ioctl.c > @@ -1670,19 +1670,14 @@ static int check_version(unsigned int cmd, struct dm_ioctl __user *user) > return r; > } > > -#define DM_PARAMS_KMALLOC 0x0001 /* Params alloced with kmalloc */ > -#define DM_PARAMS_VMALLOC 0x0002 /* Params alloced with vmalloc */ > -#define DM_WIPE_BUFFER 0x0010 /* Wipe input buffer before returning from ioctl */ > +#define DM_WIPE_BUFFER 0x0001 /* Wipe input buffer before returning from ioctl */ > > static void free_params(struct dm_ioctl *param, size_t param_size, int param_flags) > { > if (param_flags & DM_WIPE_BUFFER) > memset(param, 0, param_size); > > - if (param_flags & DM_PARAMS_KMALLOC) > - kfree(param); > - if (param_flags & DM_PARAMS_VMALLOC) > - vfree(param); > + kvfree(param); > } > > static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl *param_kernel, > @@ -1714,19 +1709,14 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl *param_kern > * Use kmalloc() rather than vmalloc() when we can. > */ > dmi = NULL; > - if (param_kernel->data_size <= KMALLOC_MAX_SIZE) { > + if (param_kernel->data_size <= KMALLOC_MAX_SIZE) > dmi = kmalloc(param_kernel->data_size, GFP_NOIO | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN); > - if (dmi) > - *param_flags |= DM_PARAMS_KMALLOC; > - } > > if (!dmi) { > unsigned noio_flag; > noio_flag = memalloc_noio_save(); > dmi = __vmalloc(param_kernel->data_size, GFP_NOIO | __GFP_HIGH | __GFP_HIGHMEM, PAGE_KERNEL); > memalloc_noio_restore(noio_flag); > - if (dmi) > - *param_flags |= DM_PARAMS_VMALLOC; > } > > if (!dmi) { > -- > 2.8.0.rc3 >