From: Michal Hocko <mhocko@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>, Shaohua Li <shli@kernel.org>,
Mikulas Patocka <mpatocka@redhat.com>,
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 [thread overview]
Message-ID: <1461849846-27209-20-git-send-email-mhocko@kernel.org> (raw)
In-Reply-To: <1461849846-27209-1-git-send-email-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
Use kvfree rather than DM_PARAMS_[KV]MALLOC specific param flags.
Cc: Shaohua Li <shli@kernel.org>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: dm-devel@redhat.com
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-04-28 13:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 13:23 [PATCH 0/19] get rid of superfluous __GFP_REPEAT Michal Hocko
2016-04-28 13:23 ` [PATCH 01/20] tree wide: get rid of __GFP_REPEAT for order-0 allocations part I Michal Hocko
2016-04-28 13:23 ` [PATCH 02/20] x86: get rid of superfluous __GFP_REPEAT Michal Hocko
2016-04-28 13:23 ` [PATCH 03/20] x86/efi: " Michal Hocko
2016-04-28 13:23 ` [PATCH 04/20] arm: " Michal Hocko
2016-04-28 14:55 ` Russell King - ARM Linux
2016-04-28 15:08 ` Michal Hocko
2016-04-29 9:41 ` Michal Hocko
2016-04-28 13:23 ` [PATCH 05/20] arm64: " Michal Hocko
2016-04-28 13:23 ` [PATCH 06/20] arc: " Michal Hocko
2016-04-28 13:23 ` [PATCH 07/20] mips: " Michal Hocko
2016-04-28 13:23 ` [PATCH 08/20] nios2: " Michal Hocko
2016-04-28 13:23 ` [PATCH 09/20] parisc: " Michal Hocko
2016-04-28 13:23 ` [PATCH 10/20] score: " Michal Hocko
2016-04-28 13:23 ` [PATCH 11/20] powerpc: " Michal Hocko
2016-04-28 13:23 ` [PATCH 12/20] sparc: " Michal Hocko
2016-04-28 13:23 ` [PATCH 13/20] s390: " Michal Hocko
2016-04-28 13:24 ` [PATCH 14/20] sh: " Michal Hocko
2016-04-28 13:24 ` [PATCH 15/20] tile: " Michal Hocko
2016-04-28 16:21 ` Chris Metcalf
2016-04-28 13:24 ` [PATCH 16/20] unicore32: " Michal Hocko
2016-04-28 13:24 ` [PATCH 17/20] dm: get rid of superfluous gfp flags Michal Hocko
2016-04-29 18:54 ` Mike Snitzer
2016-05-02 7:31 ` Michal Hocko
2016-04-28 13:24 ` [PATCH 18/20] dm: clean up GFP_NIO usage Michal Hocko
2016-04-28 14:20 ` Mikulas Patocka
2016-04-28 14:41 ` Michal Hocko
2016-04-28 13:24 ` Michal Hocko [this message]
2016-04-28 14:51 ` [PATCH] md: simplify free_params for kmalloc vs vmalloc fallback Michal Hocko
2016-04-28 15:04 ` Mikulas Patocka
2016-04-28 15:28 ` Michal Hocko
2016-04-28 15:40 ` Mikulas Patocka
2016-04-28 16:59 ` Michal Hocko
2016-04-28 15:37 ` [PATCH 19/20] " Mike Snitzer
2016-04-28 16:00 ` Michal Hocko
2016-04-28 13:24 ` [PATCH 20/20] jbd2: get rid of superfluous __GFP_REPEAT Michal Hocko
2016-05-12 16:53 ` [PATCH 0/19] " Michal Hocko
2016-05-12 20:13 ` Andrew Morton
2016-05-13 6:58 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461849846-27209-20-git-send-email-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dm-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=mpatocka@redhat.com \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).