Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753005AbcD1NYo (ORCPT ); Thu, 28 Apr 2016 09:24:44 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36661 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752885AbcD1NY2 (ORCPT ); Thu, 28 Apr 2016 09:24:28 -0400 From: Michal Hocko To: Andrew Morton Cc: , LKML , Michal Hocko , Shaohua Li , Mikulas Patocka , dm-devel@redhat.com Subject: [PATCH 19/20] md: simplify free_params for kmalloc vs vmalloc fallback Date: Thu, 28 Apr 2016 15:24:05 +0200 Message-Id: <1461849846-27209-20-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1461849846-27209-1-git-send-email-mhocko@kernel.org> References: <1461849846-27209-1-git-send-email-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2007 Lines: 60 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 --- drivers/md/dm-ioctl.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index fe0b57d7573c..2b48c49774bc 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,17 +1709,11 @@ 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_KERNEL | __GFP_NORETRY | __GFP_NOWARN); - if (dmi) - *param_flags |= DM_PARAMS_KMALLOC; - } - if (!dmi) { + if (!dmi) dmi = __vmalloc(param_kernel->data_size, GFP_KERNEL | __GFP_HIGH | __GFP_HIGHMEM, PAGE_KERNEL); - if (dmi) - *param_flags |= DM_PARAMS_VMALLOC; - } if (!dmi) { if (secure_data && clear_user(user, param_kernel->data_size)) -- 2.8.0.rc3