Commit 5170a3b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge fixes from Andrew Morton:
 "14 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  shmem: fix init_page_accessed use to stop !PageLRU bug
  kernel/printk/printk.c: revert "printk: enable interrupts before calling console_trylock_for_printk()"
  tools/testing/selftests/ipc/msgque.c: improve error handling when not running as root
  fs/seq_file: fallback to vmalloc allocation
  /proc/stat: convert to single_open_size()
  hwpoison: fix the handling path of the victimized page frame that belong to non-LRU
  mm:vmscan: update the trace-vmscan-postprocess.pl for event vmscan/mm_vmscan_lru_isolate
  msync: fix incorrect fstart calculation
  zram: revalidate disk after capacity change
  tools: memory-hotplug fix unexpected operator error
  tools: cpu-hotplug fix unexpected operator error
  autofs4: fix false positive compile error
  slub: fix off by one in number of slab tests
  mm: page_alloc: fix CMA area initialisation when pageblock > MAX_ORDER
parents e55a3798 66d2f4d2

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

+2 −12
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ use constant HIGH_KSWAPD_REWAKEUP => 21; 
use constant HIGH_NR_SCANNED			=> 22;

use constant HIGH_NR_TAKEN			=> 23;

use constant HIGH_NR_RECLAIMED			=> 24;

use constant HIGH_NR_CONTIG_DIRTY		=> 25;



my %perprocesspid;

my %perprocess;
@@ -105,7 +104,7 @@ my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)'; 
my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';

my $regex_kswapd_sleep_default = 'nid=([0-9]*)';

my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) contig_taken=([0-9]*) contig_dirty=([0-9]*) contig_failed=([0-9]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) file=([0-9]*)';

my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) zid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';

my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';

my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';
@@ -200,7 +199,7 @@ $regex_lru_isolate = generate_traceevent_regex( 
			$regex_lru_isolate_default,

			"isolate_mode", "order",

			"nr_requested", "nr_scanned", "nr_taken",

			"contig_taken", "contig_dirty", "contig_failed");

			"file");

$regex_lru_shrink_inactive = generate_traceevent_regex(

			"vmscan/mm_vmscan_lru_shrink_inactive",

			$regex_lru_shrink_inactive_default,
@@ -375,7 +374,6 @@ EVENT_PROCESS: 
			}

			my $isolate_mode = $1;

			my $nr_scanned = $4;

			my $nr_contig_dirty = $7;



			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation
@@ -385,7 +383,6 @@ EVENT_PROCESS: 
			if ($isolate_mode != 2) {

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

			}

			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

		} elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {

			$details = $6;

			if ($details !~ /$regex_lru_shrink_inactive/o) {
@@ -539,13 +536,6 @@ sub dump_stats { 
				}

			}

		}

		if ($stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY}) {

			print "      ";

			my $count = $stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY};

			if ($count != 0) {

				print "contig-dirty=$count ";

			}

		}



		print "\n";

	}

drivers/block/zram/zram_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -622,8 +622,10 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity) 
	memset(&zram->stats, 0, sizeof(zram->stats));



	zram->disksize = 0;

	if (reset_capacity)

	if (reset_capacity) {

		set_capacity(zram->disk, 0);

		revalidate_disk(zram->disk);

	}

	up_write(&zram->init_lock);

}
@@ -664,6 +666,7 @@ static ssize_t disksize_store(struct device *dev, 
	zram->comp = comp;

	zram->disksize = disksize;

	set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);

	revalidate_disk(zram->disk);

	up_write(&zram->init_lock);

	return len;

fs/autofs4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	int pipefd;

	struct autofs_sb_info *sbi;

	struct autofs_info *ino;

	int pgrp;

	int pgrp = 0;

	bool pgrp_set = false;

	int ret = -EINVAL;

fs/proc/stat.c

+2 −20
Original line number Diff line number Diff line
@@ -184,29 +184,11 @@ static int show_stat(struct seq_file *p, void *v) 


static int stat_open(struct inode *inode, struct file *file)

{

	size_t size = 1024 + 128 * num_possible_cpus();

	char *buf;

	struct seq_file *m;

	int res;

	size_t size = 1024 + 128 * num_online_cpus();



	/* minimum size to display an interrupt count : 2 bytes */

	size += 2 * nr_irqs;



	/* don't ask for more than the kmalloc() max size */

	if (size > KMALLOC_MAX_SIZE)

		size = KMALLOC_MAX_SIZE;

	buf = kmalloc(size, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	res = single_open(file, show_stat, NULL);

	if (!res) {

		m = file->private_data;

		m->buf = buf;

		m->size = ksize(buf);

	} else

		kfree(buf);

	return res;

	return single_open_size(file, show_stat, NULL, size);

}



static const struct file_operations proc_stat_operations = {

fs/seq_file.c

+21 −9
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 
#include <linux/fs.h>

#include <linux/export.h>

#include <linux/seq_file.h>

#include <linux/vmalloc.h>

#include <linux/slab.h>

#include <linux/cred.h>

#include <linux/mm.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -30,6 +32,16 @@ static void seq_set_overflow(struct seq_file *m) 
	m->count = m->size;

}



static void *seq_buf_alloc(unsigned long size)

{

	void *buf;



	buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);

	if (!buf && size > PAGE_SIZE)

		buf = vmalloc(size);

	return buf;

}



/**

 *	seq_open -	initialize sequential file

 *	@file: file we initialize
@@ -96,7 +108,7 @@ static int traverse(struct seq_file *m, loff_t offset) 
		return 0;

	}

	if (!m->buf) {

		m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);

		m->buf = seq_buf_alloc(m->size = PAGE_SIZE);

		if (!m->buf)

			return -ENOMEM;

	}
@@ -135,9 +147,9 @@ static int traverse(struct seq_file *m, loff_t offset) 


Eoverflow:

	m->op->stop(m, p);

	kfree(m->buf);

	kvfree(m->buf);

	m->count = 0;

	m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);

	m->buf = seq_buf_alloc(m->size <<= 1);

	return !m->buf ? -ENOMEM : -EAGAIN;

}
@@ -192,7 +204,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) 


	/* grab buffer if we didn't have one */

	if (!m->buf) {

		m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);

		m->buf = seq_buf_alloc(m->size = PAGE_SIZE);

		if (!m->buf)

			goto Enomem;

	}
@@ -232,9 +244,9 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) 
		if (m->count < m->size)

			goto Fill;

		m->op->stop(m, p);

		kfree(m->buf);

		kvfree(m->buf);

		m->count = 0;

		m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);

		m->buf = seq_buf_alloc(m->size <<= 1);

		if (!m->buf)

			goto Enomem;

		m->version = 0;
@@ -350,7 +362,7 @@ EXPORT_SYMBOL(seq_lseek); 
int seq_release(struct inode *inode, struct file *file)

{

	struct seq_file *m = file->private_data;

	kfree(m->buf);

	kvfree(m->buf);

	kfree(m);

	return 0;

}
@@ -605,13 +617,13 @@ EXPORT_SYMBOL(single_open); 
int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),

		void *data, size_t size)

{

	char *buf = kmalloc(size, GFP_KERNEL);

	char *buf = seq_buf_alloc(size);

	int ret;

	if (!buf)

		return -ENOMEM;

	ret = single_open(file, show, data);

	if (ret) {

		kfree(buf);

		kvfree(buf);

		return ret;

	}

	((struct seq_file *)file->private_data)->buf = buf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE