From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751672AbdF2DYV (ORCPT ); Wed, 28 Jun 2017 23:24:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54404 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751541AbdF2DYN (ORCPT ); Wed, 28 Jun 2017 23:24:13 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0F5BC80461 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mpatocka@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0F5BC80461 Date: Wed, 28 Jun 2017 23:24:10 -0400 (EDT) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: Michal Hocko , Andrew Morton , Stephen Rothwell cc: Vlastimil Babka , Andreas Dilger , John Hubbard , David Miller , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] mm: convert three more cases to kvmalloc Message-ID: User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 29 Jun 2017 03:24:13 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi I'm submitting this for the next merge window. Mikulas From: Mikulas Patocka The patch a7c3e901 ("mm: introduce kv[mz]alloc helpers") converted a lot of kernel code to kvmalloc. This patch converts three more forgotten cases. Signed-off-by: Mikulas Patocka --- fs/file.c | 12 +----------- kernel/bpf/syscall.c | 11 +---------- kernel/cgroup/cgroup-v1.c | 7 +------ 3 files changed, 3 insertions(+), 27 deletions(-) Index: linux-2.6/fs/file.c =================================================================== --- linux-2.6.orig/fs/file.c +++ linux-2.6/fs/file.c @@ -32,17 +32,7 @@ unsigned int sysctl_nr_open_max = static void *alloc_fdmem(size_t size) { - /* - * Very large allocations can stress page reclaim, so fall back to - * vmalloc() if the allocation size will be considered "large" by the VM. - */ - if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { - void *data = kmalloc(size, GFP_KERNEL_ACCOUNT | - __GFP_NOWARN | __GFP_NORETRY); - if (data != NULL) - return data; - } - return __vmalloc(size, GFP_KERNEL_ACCOUNT, PAGE_KERNEL); + return kvmalloc(size, GFP_KERNEL_ACCOUNT); } static void __free_fdtable(struct fdtable *fdt) Index: linux-2.6/kernel/bpf/syscall.c =================================================================== --- linux-2.6.orig/kernel/bpf/syscall.c +++ linux-2.6/kernel/bpf/syscall.c @@ -58,16 +58,7 @@ void *bpf_map_area_alloc(size_t size) * trigger under memory pressure as we really just want to * fail instead. */ - const gfp_t flags = __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO; - void *area; - - if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { - area = kmalloc(size, GFP_USER | flags); - if (area != NULL) - return area; - } - - return __vmalloc(size, GFP_KERNEL | flags, PAGE_KERNEL); + return kvmalloc(size, GFP_USER | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO); } void bpf_map_area_free(void *area) Index: linux-2.6/kernel/cgroup/cgroup-v1.c =================================================================== --- linux-2.6.orig/kernel/cgroup/cgroup-v1.c +++ linux-2.6/kernel/cgroup/cgroup-v1.c @@ -184,15 +184,10 @@ struct cgroup_pidlist { /* * The following two functions "fix" the issue where there are more pids * than kmalloc will give memory for; in such cases, we use vmalloc/vfree. - * TODO: replace with a kernel-wide solution to this problem */ -#define PIDLIST_TOO_LARGE(c) ((c) * sizeof(pid_t) > (PAGE_SIZE * 2)) static void *pidlist_allocate(int count) { - if (PIDLIST_TOO_LARGE(count)) - return vmalloc(count * sizeof(pid_t)); - else - return kmalloc(count * sizeof(pid_t), GFP_KERNEL); + return kvmalloc(count * sizeof(pid_t), GFP_KERNEL); } static void pidlist_free(void *p) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id 4890B6B0292 for ; Wed, 28 Jun 2017 23:24:15 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id m54so34880014qtb.9 for ; Wed, 28 Jun 2017 20:24:15 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d10si3804127qtg.184.2017.06.28.20.24.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 20:24:14 -0700 (PDT) Date: Wed, 28 Jun 2017 23:24:10 -0400 (EDT) From: Mikulas Patocka Subject: [PATCH] mm: convert three more cases to kvmalloc Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-linux-mm@kvack.org List-ID: To: Michal Hocko , Andrew Morton , Stephen Rothwell Cc: Vlastimil Babka , Andreas Dilger , John Hubbard , David Miller , linux-kernel@vger.kernel.org, linux-mm@kvack.org Hi I'm submitting this for the next merge window. Mikulas From: Mikulas Patocka The patch a7c3e901 ("mm: introduce kv[mz]alloc helpers") converted a lot of kernel code to kvmalloc. This patch converts three more forgotten cases. Signed-off-by: Mikulas Patocka --- fs/file.c | 12 +----------- kernel/bpf/syscall.c | 11 +---------- kernel/cgroup/cgroup-v1.c | 7 +------ 3 files changed, 3 insertions(+), 27 deletions(-) Index: linux-2.6/fs/file.c =================================================================== --- linux-2.6.orig/fs/file.c +++ linux-2.6/fs/file.c @@ -32,17 +32,7 @@ unsigned int sysctl_nr_open_max = static void *alloc_fdmem(size_t size) { - /* - * Very large allocations can stress page reclaim, so fall back to - * vmalloc() if the allocation size will be considered "large" by the VM. - */ - if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { - void *data = kmalloc(size, GFP_KERNEL_ACCOUNT | - __GFP_NOWARN | __GFP_NORETRY); - if (data != NULL) - return data; - } - return __vmalloc(size, GFP_KERNEL_ACCOUNT, PAGE_KERNEL); + return kvmalloc(size, GFP_KERNEL_ACCOUNT); } static void __free_fdtable(struct fdtable *fdt) Index: linux-2.6/kernel/bpf/syscall.c =================================================================== --- linux-2.6.orig/kernel/bpf/syscall.c +++ linux-2.6/kernel/bpf/syscall.c @@ -58,16 +58,7 @@ void *bpf_map_area_alloc(size_t size) * trigger under memory pressure as we really just want to * fail instead. */ - const gfp_t flags = __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO; - void *area; - - if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { - area = kmalloc(size, GFP_USER | flags); - if (area != NULL) - return area; - } - - return __vmalloc(size, GFP_KERNEL | flags, PAGE_KERNEL); + return kvmalloc(size, GFP_USER | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO); } void bpf_map_area_free(void *area) Index: linux-2.6/kernel/cgroup/cgroup-v1.c =================================================================== --- linux-2.6.orig/kernel/cgroup/cgroup-v1.c +++ linux-2.6/kernel/cgroup/cgroup-v1.c @@ -184,15 +184,10 @@ struct cgroup_pidlist { /* * The following two functions "fix" the issue where there are more pids * than kmalloc will give memory for; in such cases, we use vmalloc/vfree. - * TODO: replace with a kernel-wide solution to this problem */ -#define PIDLIST_TOO_LARGE(c) ((c) * sizeof(pid_t) > (PAGE_SIZE * 2)) static void *pidlist_allocate(int count) { - if (PIDLIST_TOO_LARGE(count)) - return vmalloc(count * sizeof(pid_t)); - else - return kmalloc(count * sizeof(pid_t), GFP_KERNEL); + return kvmalloc(count * sizeof(pid_t), GFP_KERNEL); } static void pidlist_free(void *p) -- 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: email@kvack.org