Merge branch 'perf/core' into perf/urgent (4f16d4e0) · Commits · e / devices / android_kernel_samsung_universal8895

Documentation/ABI/testing/ima_policy

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ Description:
	lsm: [[subj_user=] [subj_role=] [subj_type=]		lsm: [[subj_user=] [subj_role=] [subj_type=]
	[obj_user=] [obj_role=] [obj_type=]]		[obj_user=] [obj_role=] [obj_type=]]

	base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]		base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
	mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]		mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
	fsmagic:= hex value		fsmagic:= hex value
	uid:= decimal value		uid:= decimal value
	@@ -40,11 +40,11 @@ Description:

	measure func=BPRM_CHECK		measure func=BPRM_CHECK
	measure func=FILE_MMAP mask=MAY_EXEC		measure func=FILE_MMAP mask=MAY_EXEC
	measure func=INODE_PERM mask=MAY_READ uid=0		measure func=FILE_CHECK mask=MAY_READ uid=0

	The default policy measures all executables in bprm_check,		The default policy measures all executables in bprm_check,
	all files mmapped executable in file_mmap, and all files		all files mmapped executable in file_mmap, and all files
	open for read by root in inode_permission.		open for read by root in do_filp_open.

	Examples of LSM specific definitions:		Examples of LSM specific definitions:

	@@ -54,8 +54,8 @@ Description:

	dont_measure obj_type=var_log_t		dont_measure obj_type=var_log_t
	dont_measure obj_type=auditd_log_t		dont_measure obj_type=auditd_log_t
	measure subj_user=system_u func=INODE_PERM mask=MAY_READ		measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
	measure subj_role=system_r func=INODE_PERM mask=MAY_READ		measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

	Smack:		Smack:
	measure subj_user=_ func=INODE_PERM mask=MAY_READ		measure subj_user=_ func=FILE_CHECK mask=MAY_READ

Documentation/cpu-freq/governors.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -145,8 +145,8 @@ show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
	up_threshold: defines what the average CPU usage between the samplings		up_threshold: defines what the average CPU usage between the samplings
	of 'sampling_rate' needs to be for the kernel to make a decision on		of 'sampling_rate' needs to be for the kernel to make a decision on
	whether it should increase the frequency. For example when it is set		whether it should increase the frequency. For example when it is set
	to its default value of '80' it means that between the checking		to its default value of '95' it means that between the checking
	intervals the CPU needs to be on average more than 80% in use to then		intervals the CPU needs to be on average more than 95% in use to then
	decide that the CPU frequency needs to be increased.		decide that the CPU frequency needs to be increased.

	ignore_nice_load: this parameter takes a value of '0' or '1'. When		ignore_nice_load: this parameter takes a value of '0' or '1'. When

Documentation/kernel-parameters.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -199,6 +199,10 @@ and is between 256 and 4096 characters. It is defined in the file
	acpi_display_output=video		acpi_display_output=video
	See above.		See above.

			acpi_early_pdc_eval [HW,ACPI] Evaluate processor _PDC methods
			early. Needed on some platforms to properly
			initialize the EC.

	acpi_irq_balance [HW,ACPI]		acpi_irq_balance [HW,ACPI]
	ACPI will balance active IRQs		ACPI will balance active IRQs
	default in APIC mode		default in APIC mode
	@@ -311,6 +315,11 @@ and is between 256 and 4096 characters. It is defined in the file
	aic79xx= [HW,SCSI]		aic79xx= [HW,SCSI]
	See Documentation/scsi/aic79xx.txt.		See Documentation/scsi/aic79xx.txt.

			alignment= [KNL,ARM]
			Allow the default userspace alignment fault handler
			behaviour to be specified. Bit 0 enables warnings,
			bit 1 enables fixups, and bit 2 sends a segfault.

	amd_iommu= [HW,X86-84]		amd_iommu= [HW,X86-84]
	Pass parameters to the AMD IOMMU driver in the system.		Pass parameters to the AMD IOMMU driver in the system.
	Possible values are:		Possible values are:

Documentation/networking/ip-sysctl.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1074,10 +1074,10 @@ regen_max_retry - INTEGER
	Default: 5		Default: 5

	max_addresses - INTEGER		max_addresses - INTEGER
	Number of maximum addresses per interface. 0 disables limitation.		Maximum number of autoconfigured addresses per interface. Setting
	It is recommended not set too large value (or 0) because it would		to zero disables the limitation. It is not recommended to set this
	be too easy way to crash kernel to allow to create too much of		value too large (or to zero) because it would be an easy way to
	autoconfigured addresses.		crash the kernel by allowing too many addresses to be created.
	Default: 16		Default: 16

	disable_ipv6 - BOOLEAN		disable_ipv6 - BOOLEAN

Documentation/trace/kprobetrace.txt

+32 −25

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ Synopsis of kprobe_events
	-------------------------		-------------------------
	p[:[GRP/]EVENT] SYMBOL[+offs]\|MEMADDR [FETCHARGS] : Set a probe		p[:[GRP/]EVENT] SYMBOL[+offs]\|MEMADDR [FETCHARGS] : Set a probe
	r[:[GRP/]EVENT] SYMBOL[+0] [FETCHARGS] : Set a return probe		r[:[GRP/]EVENT] SYMBOL[+0] [FETCHARGS] : Set a return probe
			-:[GRP/]EVENT : Clear a probe

	GRP : Group name. If omitted, use "kprobes" for it.		GRP : Group name. If omitted, use "kprobes" for it.
	EVENT : Event name. If omitted, the event name is generated		EVENT : Event name. If omitted, the event name is generated
	@@ -37,15 +38,12 @@ Synopsis of kprobe_events
	@SYM[+\|-offs] : Fetch memory at SYM +\|- offs (SYM should be a data symbol)		@SYM[+\|-offs] : Fetch memory at SYM +\|- offs (SYM should be a data symbol)
	$stackN : Fetch Nth entry of stack (N >= 0)		$stackN : Fetch Nth entry of stack (N >= 0)
	$stack : Fetch stack address.		$stack : Fetch stack address.
	$argN : Fetch function argument. (N >= 0)(*)		$retval : Fetch return value.(*)
	$retval : Fetch return value.(**)		+\|-offs(FETCHARG) : Fetch memory at FETCHARG +\|- offs address.(**)
	+\|-offs(FETCHARG) : Fetch memory at FETCHARG +\|- offs address.(***)
	NAME=FETCHARG: Set NAME as the argument name of FETCHARG.		NAME=FETCHARG: Set NAME as the argument name of FETCHARG.

	(*) aN may not correct on asmlinkaged functions and at the middle of		(*) only for return probe.
	function body.		(**) this is useful for fetching a field of data structures.
	(**) only for return probe.
	(***) this is useful for fetching a field of data structures.


	Per-Probe Event Filtering		Per-Probe Event Filtering
	@@ -82,13 +80,16 @@ Usage examples
	To add a probe as a new event, write a new definition to kprobe_events		To add a probe as a new event, write a new definition to kprobe_events
	as below.		as below.

	echo p:myprobe do_sys_open dfd=$arg0 filename=$arg1 flags=$arg2 mode=$arg3 > /sys/kernel/debug/tracing/kprobe_events		echo 'p:myprobe do_sys_open dfd=%ax filename=%dx flags=%cx mode=+4($stack)' > /sys/kernel/debug/tracing/kprobe_events

	This sets a kprobe on the top of do_sys_open() function with recording		This sets a kprobe on the top of do_sys_open() function with recording
	1st to 4th arguments as "myprobe" event. As this example shows, users can		1st to 4th arguments as "myprobe" event. Note, which register/stack entry is
	choose more familiar names for each arguments.		assigned to each function argument depends on arch-specific ABI. If you unsure
			the ABI, please try to use probe subcommand of perf-tools (you can find it
			under tools/perf/).
			As this example shows, users can choose more familiar names for each arguments.

	echo r:myretprobe do_sys_open $retval >> /sys/kernel/debug/tracing/kprobe_events		echo 'r:myretprobe do_sys_open $retval' >> /sys/kernel/debug/tracing/kprobe_events

	This sets a kretprobe on the return point of do_sys_open() function with		This sets a kretprobe on the return point of do_sys_open() function with
	recording return value as "myretprobe" event.		recording return value as "myretprobe" event.
	@@ -97,23 +98,24 @@ recording return value as "myretprobe" event.

	cat /sys/kernel/debug/tracing/events/kprobes/myprobe/format		cat /sys/kernel/debug/tracing/events/kprobes/myprobe/format
	name: myprobe		name: myprobe
	ID: 75		ID: 780
	format:		format:
	field:unsigned short common_type; offset:0; size:2;		field:unsigned short common_type; offset:0; size:2; signed:0;
	field:unsigned char common_flags; offset:2; size:1;		field:unsigned char common_flags; offset:2; size:1; signed:0;
	field:unsigned char common_preempt_count; offset:3; size:1;		field:unsigned char common_preempt_count; offset:3; size:1;signed:0;
	field:int common_pid; offset:4; size:4;		field:int common_pid; offset:4; size:4; signed:1;
	field:int common_tgid; offset:8; size:4;		field:int common_lock_depth; offset:8; size:4; signed:1;

	field: unsigned long ip; offset:16;tsize:8;		field:unsigned long __probe_ip; offset:12; size:4; signed:0;
	field: int nargs; offset:24;tsize:4;		field:int __probe_nargs; offset:16; size:4; signed:1;
	field: unsigned long dfd; offset:32;tsize:8;		field:unsigned long dfd; offset:20; size:4; signed:0;
	field: unsigned long filename; offset:40;tsize:8;		field:unsigned long filename; offset:24; size:4; signed:0;
	field: unsigned long flags; offset:48;tsize:8;		field:unsigned long flags; offset:28; size:4; signed:0;
	field: unsigned long mode; offset:56;tsize:8;		field:unsigned long mode; offset:32; size:4; signed:0;

	print fmt: "(%lx) dfd=%lx filename=%lx flags=%lx mode=%lx", REC->ip, REC->dfd, REC->filename, REC->flags, REC->mode

			print fmt: "(%lx) dfd=%lx filename=%lx flags=%lx mode=%lx", REC->__probe_ip,
			REC->dfd, REC->filename, REC->flags, REC->mode

	You can see that the event has 4 arguments as in the expressions you specified.		You can see that the event has 4 arguments as in the expressions you specified.

	@@ -121,6 +123,12 @@ print fmt: "(%lx) dfd=%lx filename=%lx flags=%lx mode=%lx", REC->ip, REC->dfd, R

	This clears all probe points.		This clears all probe points.

			Or,

			echo -:myprobe >> kprobe_events

			This clears probe points selectively.

	Right after definition, each event is disabled by default. For tracing these		Right after definition, each event is disabled by default. For tracing these
	events, you need to enable it.		events, you need to enable it.

	@@ -146,4 +154,3 @@ events, you need to enable it.
	returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel		returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel
	returns from do_sys_open to sys_open+0x1b).		returns from do_sys_open to sys_open+0x1b).