Linux v4.13-rc6
This commit is contained in:
Justin M. Forbes
parent
5e1c70a3e2
commit
604223eb14
|
|
@ -1,73 +0,0 @@
|
|||
From caa7919d0402b9ebe40ac3f5228c31e28a933327 Mon Sep 17 00:00:00 2001
|
||||
From: Laura Abbott <labbott@redhat.com>
|
||||
Date: Wed, 16 Aug 2017 14:56:31 -0700
|
||||
Subject: [PATCH] mm/vmalloc: Don't unconditonally use __GFP_HIGHMEM
|
||||
To: Andrew Morton <akpm@linux-foundation.org>
|
||||
To: Michal Hocko <mhocko@suse.com>
|
||||
To: Vlastimil Babka <vbabka@suse.cz>
|
||||
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
|
||||
Cc: linux-mm@kvack.org
|
||||
Cc: linux-kernel@vger.kernel.org
|
||||
|
||||
Commit 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
|
||||
added use of __GFP_HIGHMEM for allocations. vmalloc_32 may use
|
||||
GFP_DMA/GFP_DMA32 which does not play nice with __GFP_HIGHMEM
|
||||
and will drigger a BUG in gfp_zone. Only add __GFP_HIGHMEM if
|
||||
we aren't using GFP_DMA/GFP_DMA32.
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1482249
|
||||
Fixes: 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
|
||||
Signed-off-by: Laura Abbott <labbott@redhat.com>
|
||||
---
|
||||
mm/vmalloc.c | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
|
||||
index 8698c1c86c4d..a47e3894c775 100644
|
||||
--- a/mm/vmalloc.c
|
||||
+++ b/mm/vmalloc.c
|
||||
@@ -1671,7 +1671,10 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
||||
struct page **pages;
|
||||
unsigned int nr_pages, array_size, i;
|
||||
const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
|
||||
- const gfp_t alloc_mask = gfp_mask | __GFP_HIGHMEM | __GFP_NOWARN;
|
||||
+ const gfp_t alloc_mask = gfp_mask | __GFP_NOWARN;
|
||||
+ const gfp_t highmem_mask = (gfp_mask & (GFP_DMA | GFP_DMA32)) ?
|
||||
+ 0 :
|
||||
+ __GFP_HIGHMEM;
|
||||
|
||||
nr_pages = get_vm_area_size(area) >> PAGE_SHIFT;
|
||||
array_size = (nr_pages * sizeof(struct page *));
|
||||
@@ -1679,7 +1682,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
||||
area->nr_pages = nr_pages;
|
||||
/* Please note that the recursion is strictly bounded. */
|
||||
if (array_size > PAGE_SIZE) {
|
||||
- pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
|
||||
+ pages = __vmalloc_node(array_size, 1, nested_gfp|highmem_mask,
|
||||
PAGE_KERNEL, node, area->caller);
|
||||
} else {
|
||||
pages = kmalloc_node(array_size, nested_gfp, node);
|
||||
@@ -1700,9 +1703,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
||||
}
|
||||
|
||||
if (node == NUMA_NO_NODE)
|
||||
- page = alloc_page(alloc_mask);
|
||||
+ page = alloc_page(alloc_mask|highmem_mask);
|
||||
else
|
||||
- page = alloc_pages_node(node, alloc_mask, 0);
|
||||
+ page = alloc_pages_node(node, alloc_mask|highmem_mask, 0);
|
||||
|
||||
if (unlikely(!page)) {
|
||||
/* Successfully allocated i pages, free them in __vunmap() */
|
||||
@@ -1710,7 +1713,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
||||
goto fail;
|
||||
}
|
||||
area->pages[i] = page;
|
||||
- if (gfpflags_allow_blocking(gfp_mask))
|
||||
+ if (gfpflags_allow_blocking(gfp_mask|highmem_mask))
|
||||
cond_resched();
|
||||
}
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
2
gitrev
2
gitrev
|
|
@ -1 +1 @@
|
|||
039a8e38473323ed9f6c4415b4c3a36777efac34
|
||||
14ccee78fc82f5512908f4424f541549a5705b89
|
||||
|
|
|
|||
11
kernel.spec
11
kernel.spec
|
|
@ -67,9 +67,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%global rcrev 5
|
||||
%global rcrev 6
|
||||
# The git snapshot level
|
||||
%define gitrev 4
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -649,9 +649,6 @@ Patch617: Fix-for-module-sig-verification.patch
|
|||
# request for bug fix
|
||||
Patch618: iio-race-fix.patch
|
||||
|
||||
# rhbz 1482249
|
||||
Patch619: 0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2205,6 +2202,10 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Aug 21 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc6.git0.1
|
||||
- Disable debugging options.
|
||||
- Linux v4.13-rc6
|
||||
|
||||
* Fri Aug 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc5.git4.1
|
||||
- Linux v4.13-rc5-130-g039a8e384733
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,4 +1,3 @@
|
|||
SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
|
||||
SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
|
||||
SHA512 (patch-4.13-rc5.xz) = eebba5b56aa93aaea8ff450febbd13bb5ffef9a8331666dc6ac44a73b355e8ec36d9d27da1aaec07e45844669bd31e9d8fadd278aa6d04356af2aa90387d65ac
|
||||
SHA512 (patch-4.13-rc5-git4.xz) = a3ad1e99aecfa55ff9f6f9e13a39a594e3ba463c905b2682683a6a667b6c323ae668befc9d71ee21a1ecf6fe313402aa40a4ce3e2da5db5a1b3cf4e3722ee642
|
||||
SHA512 (patch-4.13-rc6.xz) = bc3dbb6c69a663614132c85cf51b0c390d6c8f6f5be4f950ee5425a16c3b929e59e98fd6bc7ea601f7b369af0e9cad4f21276a12707c6c001f500daaafb07860
|
||||
|
|
|
|||
Loading…
Reference in New Issue