Commit 33caee39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patchbomb from Andrew Morton) 

Merge incoming from Andrew Morton:
 - Various misc things.
 - arch/sh updates.
 - Part of ocfs2.  Review is slow.
 - Slab updates.
 - Most of -mm.
 - printk updates.
 - lib/ updates.
 - checkpatch updates.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (226 commits)
  checkpatch: update $declaration_macros, add uninitialized_var
  checkpatch: warn on missing spaces in broken up quoted
  checkpatch: fix false positives for --strict "space after cast" test
  checkpatch: fix false positive MISSING_BREAK warnings with --file
  checkpatch: add test for native c90 types in unusual order
  checkpatch: add signed generic types
  checkpatch: add short int to c variable types
  checkpatch: add for_each tests to indentation and brace tests
  checkpatch: fix brace style misuses of else and while
  checkpatch: add --fix option for a couple OPEN_BRACE misuses
  checkpatch: use the correct indentation for which()
  checkpatch: add fix_insert_line and fix_delete_line helpers
  checkpatch: add ability to insert and delete lines to patch/file
  checkpatch: add an index variable for fixed lines
  checkpatch: warn on break after goto or return with same tab indentation
  checkpatch: emit a warning on file add/move/delete
  checkpatch: add test for commit id formatting style in commit log
  checkpatch: emit fewer kmalloc_array/kcalloc conversion warnings
  checkpatch: improve "no space after cast" test
  checkpatch: allow multiple const * types
  ...
parents 6456a043 f8422308

Documentation/RCU/whatisRCU.txt

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ RCU pointer/list update: 
	list_add_tail_rcu

	list_del_rcu

	list_replace_rcu

	hlist_add_after_rcu

	hlist_add_behind_rcu

	hlist_add_before_rcu

	hlist_add_head_rcu

	hlist_del_rcu

Documentation/kernel-parameters.txt

+6 −2
Original line number Diff line number Diff line
@@ -1716,8 +1716,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			7 (KERN_DEBUG)		debug-level messages



	log_buf_len=n[KMG]	Sets the size of the printk ring buffer,

			in bytes.  n must be a power of two.  The default

			size is set in the kernel config file.

			in bytes.  n must be a power of two and greater

			than the minimal size. The minimal size is defined

			by LOG_BUF_SHIFT kernel config parameter. There is

			also CONFIG_LOG_CPU_MAX_BUF_SHIFT config parameter

			that allows to increase the default size depending on

			the number of CPUs. See init/Kconfig for more details.



	logo.nologo	[FB] Disables display of the built-in Linux logo.

			This may be used to provide more screen space for

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

+53 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 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_FILE_SCANNED		=> 25;

use constant HIGH_NR_ANON_SCANNED		=> 26;

use constant HIGH_NR_FILE_RECLAIMED		=> 27;

use constant HIGH_NR_ANON_RECLAIMED		=> 28;



my %perprocesspid;

my %perprocess;
@@ -56,14 +60,18 @@ my $opt_read_procstat; 


my $total_wakeup_kswapd;

my ($total_direct_reclaim, $total_direct_nr_scanned);

my ($total_direct_nr_file_scanned, $total_direct_nr_anon_scanned);

my ($total_direct_latency, $total_kswapd_latency);

my ($total_direct_nr_reclaimed);

my ($total_direct_nr_file_reclaimed, $total_direct_nr_anon_reclaimed);

my ($total_direct_writepage_file_sync, $total_direct_writepage_file_async);

my ($total_direct_writepage_anon_sync, $total_direct_writepage_anon_async);

my ($total_kswapd_nr_scanned, $total_kswapd_wake);

my ($total_kswapd_nr_file_scanned, $total_kswapd_nr_anon_scanned);

my ($total_kswapd_writepage_file_sync, $total_kswapd_writepage_file_async);

my ($total_kswapd_writepage_anon_sync, $total_kswapd_writepage_anon_async);

my ($total_kswapd_nr_reclaimed);

my ($total_kswapd_nr_file_reclaimed, $total_kswapd_nr_anon_reclaimed);



# Catch sigint and exit on request

my $sigint_report = 0;
@@ -374,6 +382,7 @@ EVENT_PROCESS: 
			}

			my $isolate_mode = $1;

			my $nr_scanned = $4;

			my $file = $6;



			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation
@@ -382,6 +391,11 @@ EVENT_PROCESS: 
			# isolate_both     == 3

			if ($isolate_mode != 2) {

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

				if ($file == 1) {

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

				} else {

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

				}

			}

		} elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {

			$details = $6;
@@ -391,8 +405,19 @@ EVENT_PROCESS: 
				print "         $regex_lru_shrink_inactive/o\n";

				next;

			}



			my $nr_reclaimed = $4;

			my $flags = $6;

			my $file = 0;

			if ($flags =~ /RECLAIM_WB_FILE/) {

				$file = 1;

			}

			$perprocesspid{$process_pid}->{HIGH_NR_RECLAIMED} += $nr_reclaimed;

			if ($file) {

				$perprocesspid{$process_pid}->{HIGH_NR_FILE_RECLAIMED} += $nr_reclaimed;

			} else {

				$perprocesspid{$process_pid}->{HIGH_NR_ANON_RECLAIMED} += $nr_reclaimed;

			}

		} elsif ($tracepoint eq "mm_vmscan_writepage") {

			$details = $6;

			if ($details !~ /$regex_writepage/o) {
@@ -493,7 +518,11 @@ sub dump_stats { 
		$total_direct_reclaim += $stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN};

		$total_wakeup_kswapd += $stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};

		$total_direct_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};

		$total_direct_nr_file_scanned += $stats{$process_pid}->{HIGH_NR_FILE_SCANNED};

		$total_direct_nr_anon_scanned += $stats{$process_pid}->{HIGH_NR_ANON_SCANNED};

		$total_direct_nr_reclaimed += $stats{$process_pid}->{HIGH_NR_RECLAIMED};

		$total_direct_nr_file_reclaimed += $stats{$process_pid}->{HIGH_NR_FILE_RECLAIMED};

		$total_direct_nr_anon_reclaimed += $stats{$process_pid}->{HIGH_NR_ANON_RECLAIMED};

		$total_direct_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};

		$total_direct_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};

		$total_direct_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
@@ -513,7 +542,11 @@ sub dump_stats { 
			$stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN},

			$stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD},

			$stats{$process_pid}->{HIGH_NR_SCANNED},

			$stats{$process_pid}->{HIGH_NR_FILE_SCANNED},

			$stats{$process_pid}->{HIGH_NR_ANON_SCANNED},

			$stats{$process_pid}->{HIGH_NR_RECLAIMED},

			$stats{$process_pid}->{HIGH_NR_FILE_RECLAIMED},

			$stats{$process_pid}->{HIGH_NR_ANON_RECLAIMED},

			$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},

			$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC},

			$this_reclaim_delay / 1000);
@@ -552,7 +585,11 @@ sub dump_stats { 


		$total_kswapd_wake += $stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE};

		$total_kswapd_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};

		$total_kswapd_nr_file_scanned += $stats{$process_pid}->{HIGH_NR_FILE_SCANNED};

		$total_kswapd_nr_anon_scanned += $stats{$process_pid}->{HIGH_NR_ANON_SCANNED};

		$total_kswapd_nr_reclaimed += $stats{$process_pid}->{HIGH_NR_RECLAIMED};

		$total_kswapd_nr_file_reclaimed += $stats{$process_pid}->{HIGH_NR_FILE_RECLAIMED};

		$total_kswapd_nr_anon_reclaimed += $stats{$process_pid}->{HIGH_NR_ANON_RECLAIMED};

		$total_kswapd_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};

		$total_kswapd_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};

		$total_kswapd_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
@@ -563,7 +600,11 @@ sub dump_stats { 
			$stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE},

			$stats{$process_pid}->{HIGH_KSWAPD_REWAKEUP},

			$stats{$process_pid}->{HIGH_NR_SCANNED},

			$stats{$process_pid}->{HIGH_NR_FILE_SCANNED},

			$stats{$process_pid}->{HIGH_NR_ANON_SCANNED},

			$stats{$process_pid}->{HIGH_NR_RECLAIMED},

			$stats{$process_pid}->{HIGH_NR_FILE_RECLAIMED},

			$stats{$process_pid}->{HIGH_NR_ANON_RECLAIMED},

			$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},

			$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC});
@@ -594,7 +635,11 @@ sub dump_stats { 
	print "\nSummary\n";

	print "Direct reclaims:     			$total_direct_reclaim\n";

	print "Direct reclaim pages scanned:		$total_direct_nr_scanned\n";

	print "Direct reclaim file pages scanned:	$total_direct_nr_file_scanned\n";

	print "Direct reclaim anon pages scanned:	$total_direct_nr_anon_scanned\n";

	print "Direct reclaim pages reclaimed:		$total_direct_nr_reclaimed\n";

	print "Direct reclaim file pages reclaimed:	$total_direct_nr_file_reclaimed\n";

	print "Direct reclaim anon pages reclaimed:	$total_direct_nr_anon_reclaimed\n";

	print "Direct reclaim write file sync I/O:	$total_direct_writepage_file_sync\n";

	print "Direct reclaim write anon sync I/O:	$total_direct_writepage_anon_sync\n";

	print "Direct reclaim write file async I/O:	$total_direct_writepage_file_async\n";
@@ -604,7 +649,11 @@ sub dump_stats { 
	print "\n";

	print "Kswapd wakeups:				$total_kswapd_wake\n";

	print "Kswapd pages scanned:			$total_kswapd_nr_scanned\n";

	print "Kswapd file pages scanned:		$total_kswapd_nr_file_scanned\n";

	print "Kswapd anon pages scanned:		$total_kswapd_nr_anon_scanned\n";

	print "Kswapd pages reclaimed:			$total_kswapd_nr_reclaimed\n";

	print "Kswapd file pages reclaimed:		$total_kswapd_nr_file_reclaimed\n";

	print "Kswapd anon pages reclaimed:		$total_kswapd_nr_anon_reclaimed\n";

	print "Kswapd reclaim write file sync I/O:	$total_kswapd_writepage_file_sync\n";

	print "Kswapd reclaim write anon sync I/O:	$total_kswapd_writepage_anon_sync\n";

	print "Kswapd reclaim write file async I/O:	$total_kswapd_writepage_file_async\n";
@@ -629,7 +678,11 @@ sub aggregate_perprocesspid() { 
		$perprocess{$process}->{MM_VMSCAN_WAKEUP_KSWAPD} += $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};

		$perprocess{$process}->{HIGH_KSWAPD_REWAKEUP} += $perprocesspid{$process_pid}->{HIGH_KSWAPD_REWAKEUP};

		$perprocess{$process}->{HIGH_NR_SCANNED} += $perprocesspid{$process_pid}->{HIGH_NR_SCANNED};

		$perprocess{$process}->{HIGH_NR_FILE_SCANNED} += $perprocesspid{$process_pid}->{HIGH_NR_FILE_SCANNED};

		$perprocess{$process}->{HIGH_NR_ANON_SCANNED} += $perprocesspid{$process_pid}->{HIGH_NR_ANON_SCANNED};

		$perprocess{$process}->{HIGH_NR_RECLAIMED} += $perprocesspid{$process_pid}->{HIGH_NR_RECLAIMED};

		$perprocess{$process}->{HIGH_NR_FILE_RECLAIMED} += $perprocesspid{$process_pid}->{HIGH_NR_FILE_RECLAIMED};

		$perprocess{$process}->{HIGH_NR_ANON_RECLAIMED} += $perprocesspid{$process_pid}->{HIGH_NR_ANON_RECLAIMED};

		$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};

		$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};

		$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};

Makefile

+19 −0
Original line number Diff line number Diff line
@@ -621,6 +621,9 @@ else 
KBUILD_CFLAGS	+= -O2

endif



# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)



ifdef CONFIG_READABLE_ASM

# Disable optimizations that make assembler listings hard to read.

# reorder blocks reorders the control in the function
@@ -636,6 +639,22 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) 
endif



# Handle stack protector mode.

#

# Since kbuild can potentially perform two passes (first with the old

# .config values and then with updated .config values), we cannot error out

# if a desired compiler option is unsupported. If we were to error, kbuild

# could never get to the second pass and actually notice that we changed

# the option to something that was supported.

#

# Additionally, we don't want to fallback and/or silently change which compiler

# flags will be used, since that leads to producing kernels with different

# security feature characteristics depending on the compiler used. ("But I

# selected CC_STACKPROTECTOR_STRONG! Why did it build with _REGULAR?!")

#

# The middle ground is to warn here so that the failed option is obvious, but

# to let the build fail with bad compiler flags so that we can't produce a

# kernel when there is a CONFIG and compiler mismatch.

#

ifdef CONFIG_CC_STACKPROTECTOR_REGULAR

  stackp-flag := -fstack-protector

  ifeq ($(call cc-option, $(stackp-flag)),)

arch/arm/mm/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/io.h>

#include <linux/vmalloc.h>

#include <linux/sizes.h>

#include <linux/cma.h>



#include <asm/memory.h>

#include <asm/highmem.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE