Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"11 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
kvm, mm: account shadow page tables to kmemcg
zswap: re-check zswap_is_full() after do zswap_shrink()
include/linux/eventfd.h: include linux/errno.h
mm: fix vma_is_anonymous() false-positives
mm: use vma_init() to initialize VMAs on stack and data segments
mm: introduce vma_init()
mm: fix exports that inadvertently make put_page() EXPORT_SYMBOL_GPL
ipc/sem.c: prevent queue.status tearing in semop
mm: disallow mappings that conflict for devm_memremap_pages()
kasan: only select SLUB_DEBUG with SYSFS=y
delayacct: fix crash in delayacct_blkio_end() after delayacct init failure
+73
-18
+1
arch/arm/kernel/process.c
+1
arch/arm/kernel/process.c
+1
-1
arch/arm/mach-rpc/ecard.c
+1
-1
arch/arm/mach-rpc/ecard.c
···
237
237
238
238
memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE));
239
239
240
+
vma_init(&vma, mm);
240
241
vma.vm_flags = VM_EXEC;
241
-
vma.vm_mm = mm;
242
242
243
243
flush_tlb_range(&vma, IO_START, IO_START + IO_SIZE);
244
244
flush_tlb_range(&vma, EASI_START, EASI_START + EASI_SIZE);
+3
-1
arch/arm64/include/asm/tlb.h
+3
-1
arch/arm64/include/asm/tlb.h
+5
-2
arch/arm64/mm/hugetlbpage.c
+5
-2
arch/arm64/mm/hugetlbpage.c
···
108
108
unsigned long pgsize,
109
109
unsigned long ncontig)
110
110
{
111
-
struct vm_area_struct vma = { .vm_mm = mm };
111
+
struct vm_area_struct vma;
112
112
pte_t orig_pte = huge_ptep_get(ptep);
113
113
bool valid = pte_valid(orig_pte);
114
114
unsigned long i, saddr = addr;
115
+
116
+
vma_init(&vma, mm);
115
117
116
118
for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) {
117
119
pte_t pte = ptep_get_and_clear(mm, addr, ptep);
···
147
145
unsigned long pgsize,
148
146
unsigned long ncontig)
149
147
{
150
-
struct vm_area_struct vma = { .vm_mm = mm };
148
+
struct vm_area_struct vma;
151
149
unsigned long i, saddr = addr;
152
150
151
+
vma_init(&vma, mm);
153
152
for (i = 0; i < ncontig; i++, addr += pgsize, ptep++)
154
153
pte_clear(mm, addr, ptep);
155
154
+1
-1
arch/ia64/include/asm/tlb.h
+1
-1
arch/ia64/include/asm/tlb.h
+1
-1
arch/ia64/mm/init.c
+1
-1
arch/ia64/mm/init.c
+1
-1
arch/x86/kvm/mmu.c
+1
-1
arch/x86/kvm/mmu.c
···
890
890
if (cache->nobjs >= min)
891
891
return 0;
892
892
while (cache->nobjs < ARRAY_SIZE(cache->objects)) {
893
-
page = (void *)__get_free_page(GFP_KERNEL);
893
+
page = (void *)__get_free_page(GFP_KERNEL_ACCOUNT);
894
894
if (!page)
895
895
return -ENOMEM;
896
896
cache->objects[cache->nobjs++] = page;
+1
-1
arch/x86/um/mem_32.c
+1
-1
arch/x86/um/mem_32.c
+1
drivers/char/mem.c
+1
drivers/char/mem.c
+1
fs/exec.c
+1
fs/exec.c
+2
fs/hugetlbfs/inode.c
+2
fs/hugetlbfs/inode.c
···
411
411
bool truncate_op = (lend == LLONG_MAX);
412
412
413
413
memset(&pseudo_vma, 0, sizeof(struct vm_area_struct));
414
+
vma_init(&pseudo_vma, current->mm);
414
415
pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED);
415
416
pagevec_init(&pvec);
416
417
next = start;
···
596
595
* as input to create an allocation policy.
597
596
*/
598
597
memset(&pseudo_vma, 0, sizeof(struct vm_area_struct));
598
+
vma_init(&pseudo_vma, mm);
599
599
pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED);
600
600
pseudo_vma.vm_file = file;
601
601
+1
-1
include/linux/delayacct.h
+1
-1
include/linux/delayacct.h
+1
include/linux/eventfd.h
+1
include/linux/eventfd.h
+14
include/linux/mm.h
+14
include/linux/mm.h
···
452
452
unsigned long addr);
453
453
};
454
454
455
+
static inline void vma_init(struct vm_area_struct *vma, struct mm_struct *mm)
456
+
{
457
+
static const struct vm_operations_struct dummy_vm_ops = {};
458
+
459
+
vma->vm_mm = mm;
460
+
vma->vm_ops = &dummy_vm_ops;
461
+
INIT_LIST_HEAD(&vma->anon_vma_chain);
462
+
}
463
+
464
+
static inline void vma_set_anonymous(struct vm_area_struct *vma)
465
+
{
466
+
vma->vm_ops = NULL;
467
+
}
468
+
455
469
struct mmu_gather;
456
470
struct inode;
457
471
+1
-1
ipc/sem.c
+1
-1
ipc/sem.c
+2
-4
kernel/fork.c
+2
-4
kernel/fork.c
+19
-3
kernel/memremap.c
+19
-3
kernel/memremap.c
···
176
176
unsigned long pfn, pgoff, order;
177
177
pgprot_t pgprot = PAGE_KERNEL;
178
178
int error, nid, is_ram;
179
+
struct dev_pagemap *conflict_pgmap;
179
180
180
181
align_start = res->start & ~(SECTION_SIZE - 1);
181
182
align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE)
182
183
- align_start;
184
+
align_end = align_start + align_size - 1;
185
+
186
+
conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_start), NULL);
187
+
if (conflict_pgmap) {
188
+
dev_WARN(dev, "Conflicting mapping in same section\n");
189
+
put_dev_pagemap(conflict_pgmap);
190
+
return ERR_PTR(-ENOMEM);
191
+
}
192
+
193
+
conflict_pgmap = get_dev_pagemap(PHYS_PFN(align_end), NULL);
194
+
if (conflict_pgmap) {
195
+
dev_WARN(dev, "Conflicting mapping in same section\n");
196
+
put_dev_pagemap(conflict_pgmap);
197
+
return ERR_PTR(-ENOMEM);
198
+
}
199
+
183
200
is_ram = region_intersects(align_start, align_size,
184
201
IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
185
202
···
216
199
217
200
mutex_lock(&pgmap_lock);
218
201
error = 0;
219
-
align_end = align_start + align_size - 1;
220
202
221
203
foreach_order_pgoff(res, order, pgoff) {
222
204
error = __radix_tree_insert(&pgmap_radix,
···
321
305
322
306
#ifdef CONFIG_DEV_PAGEMAP_OPS
323
307
DEFINE_STATIC_KEY_FALSE(devmap_managed_key);
324
-
EXPORT_SYMBOL_GPL(devmap_managed_key);
308
+
EXPORT_SYMBOL(devmap_managed_key);
325
309
static atomic_t devmap_enable;
326
310
327
311
/*
···
362
346
} else if (!count)
363
347
__put_page(page);
364
348
}
365
-
EXPORT_SYMBOL_GPL(__put_devmap_managed_page);
349
+
EXPORT_SYMBOL(__put_devmap_managed_page);
366
350
#endif /* CONFIG_DEV_PAGEMAP_OPS */
+1
-1
lib/Kconfig.kasan
+1
-1
lib/Kconfig.kasan
+1
mm/mempolicy.c
+1
mm/mempolicy.c
···
2505
2505
2506
2506
/* Create pseudo-vma that contains just the policy */
2507
2507
memset(&pvma, 0, sizeof(struct vm_area_struct));
2508
+
vma_init(&pvma, NULL);
2508
2509
pvma.vm_end = TASK_SIZE; /* policy covers entire file */
2509
2510
mpol_set_shared_policy(sp, &pvma, new); /* adds ref */
2510
2511
+3
mm/mmap.c
+3
mm/mmap.c
···
1778
1778
error = shmem_zero_setup(vma);
1779
1779
if (error)
1780
1780
goto free_vma;
1781
+
} else {
1782
+
vma_set_anonymous(vma);
1781
1783
}
1782
1784
1783
1785
vma_link(mm, vma, prev, rb_link, rb_parent);
···
2985
2983
return -ENOMEM;
2986
2984
}
2987
2985
2986
+
vma_set_anonymous(vma);
2988
2987
vma->vm_start = addr;
2989
2988
vma->vm_end = addr + len;
2990
2989
vma->vm_pgoff = pgoff;
+2
mm/nommu.c
+2
mm/nommu.c
+1
mm/shmem.c
+1
mm/shmem.c
···
1421
1421
{
1422
1422
/* Create a pseudo vma that just contains the policy */
1423
1423
memset(vma, 0, sizeof(*vma));
1424
+
vma_init(vma, NULL);
1424
1425
/* Bias interleave by inode number to distribute better across nodes */
1425
1426
vma->vm_pgoff = index + info->vfs_inode.i_ino;
1426
1427
vma->vm_policy = mpol_shared_policy_lookup(&info->policy, index);
+9
mm/zswap.c
+9
mm/zswap.c
···
1026
1026
ret = -ENOMEM;
1027
1027
goto reject;
1028
1028
}
1029
+
1030
+
/* A second zswap_is_full() check after
1031
+
* zswap_shrink() to make sure it's now
1032
+
* under the max_pool_percent
1033
+
*/
1034
+
if (zswap_is_full()) {
1035
+
ret = -ENOMEM;
1036
+
goto reject;
1037
+
}
1029
1038
}
1030
1039
1031
1040
/* allocate entry */