Commit 1d9e3257 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable'

parents 072e5135 9c80e799

.get_maintainer.ignore

+2 −0
Original line number Diff line number Diff line 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Christoph Hellwig <hch@lst.de>

Marc Gonzalez <marc.w.gonzalez@free.fr>

drivers/block/zram/zram_drv.c

+32 −10
Original line number Diff line number Diff line
@@ -1146,14 +1146,15 @@ static ssize_t bd_stat_show(struct device *dev, 
static ssize_t debug_stat_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	int version = 2;

	int version = 1;

	struct zram *zram = dev_to_zram(dev);

	ssize_t ret;



	down_read(&zram->init_lock);

	ret = scnprintf(buf, PAGE_SIZE,

			"version: %d\n%8llu\n",

			"version: %d\n%8llu %8llu\n",

			version,

			(u64)atomic64_read(&zram->stats.writestall),

			(u64)atomic64_read(&zram->stats.miss_free));

	up_read(&zram->init_lock);
@@ -1351,7 +1352,7 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, 
{

	int ret = 0;

	unsigned long alloced_pages;

	unsigned long handle = 0;

	unsigned long handle = -ENOMEM;

	unsigned int comp_len = 0;

	void *src, *dst, *mem;

	struct zcomp_strm *zstrm;
@@ -1369,6 +1370,7 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, 
	}

	kunmap_atomic(mem);



compress_again:

	zstrm = zcomp_stream_get(zram->comp);

	src = kmap_atomic(page);

	ret = zcomp_compress(zstrm, src, &comp_len);
@@ -1377,20 +1379,39 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, 
	if (unlikely(ret)) {

		zcomp_stream_put(zram->comp);

		pr_err("Compression failed! err=%d\n", ret);

		zs_free(zram->mem_pool, handle);

		return ret;

	}



	if (comp_len >= huge_class_size)

		comp_len = PAGE_SIZE;



	/*

	 * handle allocation has 2 paths:

	 * a) fast path is executed with preemption disabled (for

	 *  per-cpu streams) and has __GFP_DIRECT_RECLAIM bit clear,

	 *  since we can't sleep;

	 * b) slow path enables preemption and attempts to allocate

	 *  the page with __GFP_DIRECT_RECLAIM bit set. we have to

	 *  put per-cpu compression stream and, thus, to re-do

	 *  the compression once handle is allocated.

	 *

	 * if we have a 'non-null' handle here then we are coming

	 * from the slow path and handle has already been allocated.

	 */

	if (IS_ERR((void *)handle))

		handle = zs_malloc(zram->mem_pool, comp_len,

				__GFP_KSWAPD_RECLAIM |

				__GFP_NOWARN |

				__GFP_HIGHMEM |

				__GFP_MOVABLE);



	if (IS_ERR((void *)handle)) {

		zcomp_stream_put(zram->comp);

		atomic64_inc(&zram->stats.writestall);

		handle = zs_malloc(zram->mem_pool, comp_len,

				GFP_NOIO | __GFP_HIGHMEM |

				__GFP_MOVABLE);

		if (!IS_ERR((void *)handle))

			goto compress_again;

		return PTR_ERR((void *)handle);

	}
@@ -1948,6 +1969,7 @@ static int zram_add(void) 
	if (ZRAM_LOGICAL_BLOCK_SIZE == PAGE_SIZE)

		blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);



	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);

	ret = device_add_disk(NULL, zram->disk, zram_disk_groups);

	if (ret)

		goto out_cleanup_disk;

drivers/block/zram/zram_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct zram_stats { 
	atomic64_t huge_pages_since;	/* no. of huge pages since zram set up */

	atomic64_t pages_stored;	/* no. of pages currently stored */

	atomic_long_t max_used_pages;	/* no. of maximum pages stored */

	atomic64_t writestall;		/* no. of write slow paths */

	atomic64_t miss_free;		/* no. of missed free */

#ifdef	CONFIG_ZRAM_WRITEBACK

	atomic64_t bd_count;		/* no. of pages in backing device */

fs/proc/task_mmu.c

+4 −3
Original line number Diff line number Diff line
@@ -527,10 +527,12 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
	struct vm_area_struct *vma = walk->vma;

	bool locked = !!(vma->vm_flags & VM_LOCKED);

	struct page *page = NULL;

	bool migration = false;

	bool migration = false, young = false, dirty = false;



	if (pte_present(*pte)) {

		page = vm_normal_page(vma, addr, *pte);

		young = pte_young(*pte);

		dirty = pte_dirty(*pte);

	} else if (is_swap_pte(*pte)) {

		swp_entry_t swpent = pte_to_swp_entry(*pte);
@@ -560,8 +562,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
	if (!page)

		return;



	smaps_account(mss, page, false, pte_young(*pte), pte_dirty(*pte),

		      locked, migration);

	smaps_account(mss, page, false, young, dirty, locked, migration);

}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

fs/userfaultfd.c

+4 −0
Original line number Diff line number Diff line
@@ -1601,6 +1601,10 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, 
			wake_userfault(vma->vm_userfaultfd_ctx.ctx, &range);

		}



		/* Reset ptes for the whole vma range if wr-protected */

		if (userfaultfd_wp(vma))

			uffd_wp_range(mm, vma, start, vma_end - start, false);



		new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS;

		prev = vma_merge(mm, prev, start, vma_end, new_flags,

				 vma->anon_vma, vma->vm_file, vma->vm_pgoff,