Commit 18d40eae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "17 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  arch: define weak abort()
  mm, oom_reaper: fix memory corruption
  kernel: make groups_sort calling a responsibility group_info allocators
  mm/frame_vector.c: release a semaphore in 'get_vaddr_frames()'
  tools/slabinfo-gnuplot: force to use bash shell
  kcov: fix comparison callback signature
  mm/slab.c: do not hash pointers when debugging slab
  mm/page_alloc.c: avoid excessive IRQ disabled times in free_unref_page_list()
  mm/memory.c: mark wp_huge_pmd() inline to prevent build failure
  scripts/faddr2line: fix CROSS_COMPILE unset error
  Documentation/vm/zswap.txt: update with same-value filled page feature
  exec: avoid gcc-8 warning for get_task_comm
  autofs: fix careless error in recent commit
  string.h: workaround for increased stack usage
  mm/kmemleak.c: make cond_resched() rate-limiting more efficient
  lib/rbtree,drm/mm: add rbtree_replace_node_cached()
  include/linux/idr.h: add #include <linux/bug.h>
parents d455df0b 7c2c11b2

Documentation/vm/zswap.txt

+21 −1
Original line number Diff line number Diff line
@@ -98,5 +98,25 @@ request is made for a page in an old zpool, it is uncompressed using its 
original compressor.  Once all pages are removed from an old zpool, the zpool

and its compressor are freed.



Some of the pages in zswap are same-value filled pages (i.e. contents of the

page have same value or repetitive pattern). These pages include zero-filled

pages and they are handled differently. During store operation, a page is

checked if it is a same-value filled page before compressing it. If true, the

compressed length of the page is set to zero and the pattern or same-filled

value is stored.



Same-value filled pages identification feature is enabled by default and can be

disabled at boot time by setting the "same_filled_pages_enabled" attribute to 0,

e.g. zswap.same_filled_pages_enabled=0. It can also be enabled and disabled at

runtime using the sysfs "same_filled_pages_enabled" attribute, e.g.



echo 1 > /sys/module/zswap/parameters/same_filled_pages_enabled



When zswap same-filled page identification is disabled at runtime, it will stop

checking for the same-value filled pages during store operation. However, the

existing pages which are marked as same-value filled pages remain stored

unchanged in zswap until they are either loaded or invalidated.



A debugfs interface is provided for various statistic about pool size, number

of pages stored, and various counters for the reasons pages are rejected.
 
of pages stored, same-value filled pages and various counters for the reasons

pages are rejected.

arch/s390/kernel/compat_linux.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setgroups16, int, gidsetsize, u16 __user *, grouplis 
		return retval;

	}



	groups_sort(group_info);

	retval = set_current_groups(group_info);

	put_group_info(group_info);

drivers/gpu/drm/drm_mm.c

+5 −3
Original line number Diff line number Diff line
@@ -575,21 +575,23 @@ EXPORT_SYMBOL(drm_mm_remove_node); 
 */

void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)

{

	struct drm_mm *mm = old->mm;



	DRM_MM_BUG_ON(!old->allocated);



	*new = *old;



	list_replace(&old->node_list, &new->node_list);

	rb_replace_node(&old->rb, &new->rb, &old->mm->interval_tree.rb_root);

	rb_replace_node_cached(&old->rb, &new->rb, &mm->interval_tree);



	if (drm_mm_hole_follows(old)) {

		list_replace(&old->hole_stack, &new->hole_stack);

		rb_replace_node(&old->rb_hole_size,

				&new->rb_hole_size,

				&old->mm->holes_size);

				&mm->holes_size);

		rb_replace_node(&old->rb_hole_addr,

				&new->rb_hole_addr,

				&old->mm->holes_addr);

				&mm->holes_addr);

	}



	old->allocated = false;

fs/autofs4/waitq.c

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi, 


	mutex_unlock(&sbi->wq_mutex);



	if (autofs4_write(sbi, pipe, &pkt, pktsz))

	switch (ret = autofs4_write(sbi, pipe, &pkt, pktsz)) {

	case 0:

		break;

fs/exec.c

+3 −4
Original line number Diff line number Diff line
@@ -1216,15 +1216,14 @@ killed: 
	return -EAGAIN;

}



char *get_task_comm(char *buf, struct task_struct *tsk)

char *__get_task_comm(char *buf, size_t buf_size, struct task_struct *tsk)

{

	/* buf must be at least sizeof(tsk->comm) in size */

	task_lock(tsk);

	strncpy(buf, tsk->comm, sizeof(tsk->comm));

	strncpy(buf, tsk->comm, buf_size);

	task_unlock(tsk);

	return buf;

}

EXPORT_SYMBOL_GPL(get_task_comm);

EXPORT_SYMBOL_GPL(__get_task_comm);



/*

 * These functions flushes out all traces of the currently running executable

CRA Git | Maintained and supported by SUSTech CRA and CCSE