Commit 0bffedbc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.7-rc7' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c50c75e9 9cb1fd0e

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Will Deacon <will@kernel.org> <will.deacon@arm.com>

Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>

Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/admin-guide/device-mapper/dm-integrity.rst

+9 −6
Original line number Diff line number Diff line
@@ -182,12 +182,15 @@ fix_padding 
	space-efficient. If this option is not present, large padding is

	used - that is for compatibility with older kernels.





The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can

be changed when reloading the target (load an inactive table and swap the

tables with suspend and resume). The other arguments should not be changed

when reloading the target because the layout of disk data depend on them

and the reloaded target would be non-functional.

allow_discards

	Allow block discard requests (a.k.a. TRIM) for the integrity device.

	Discards are only allowed to devices using internal hash.



The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and

allow_discards can be changed when reloading the target (load an inactive

table and swap the tables with suspend and resume). The other arguments

should not be changed when reloading the target because the layout of disk

data depend on them and the reloaded target would be non-functional.





The layout of the formatted block device:

Documentation/admin-guide/kernel-parameters.txt

+1 −2
Original line number Diff line number Diff line
@@ -5187,8 +5187,7 @@ 


	usbcore.old_scheme_first=

			[USB] Start with the old device initialization

			scheme,  applies only to low and full-speed devices

			 (default 0 = off).

			scheme (default 0 = off).



	usbcore.usbfs_memory_mb=

			[USB] Memory limit (in MB) for buffers allocated by

Documentation/arm64/amu.rst

+26 −21
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ optional external memory-mapped interface. 


Version 1 of the Activity Monitors architecture implements a counter group

of four fixed and architecturally defined 64-bit event counters.



- CPU cycle counter: increments at the frequency of the CPU.

- Constant counter: increments at the fixed frequency of the system

  clock.
@@ -57,6 +58,7 @@ counters, only the presence of the extension. 


Firmware (code running at higher exception levels, e.g. arm-tf) support is

needed to:



- Enable access for lower exception levels (EL2 and EL1) to the AMU

  registers.

- Enable the counters. If not enabled these will read as 0.
@@ -78,6 +80,7 @@ are not trapped in EL2/EL3. 


The fixed counters of AMUv1 are accessible though the following system

register definitions:



- SYS_AMEVCNTR0_CORE_EL0

- SYS_AMEVCNTR0_CONST_EL0

- SYS_AMEVCNTR0_INST_RET_EL0
@@ -93,6 +96,7 @@ Userspace access 
----------------



Currently, access from userspace to the AMU registers is disabled due to:



- Security reasons: they might expose information about code executed in

  secure mode.

- Purpose: AMU counters are intended for system management use.
@@ -105,6 +109,7 @@ Virtualization 


Currently, access from userspace (EL0) and kernelspace (EL1) on the KVM

guest side is disabled due to:



- Security reasons: they might expose information about code executed

  by other guests or the host.

Documentation/core-api/printk-formats.rst

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,20 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-calls are used and marked with the noreturn GCC attribute.



Probed Pointers from BPF / tracing

----------------------------------



::



	%pks	kernel string

	%pus	user string



The ``k`` and ``u`` specifiers are used for printing prior probed memory from

either kernel memory (k) or user memory (u). The subsequent ``s`` specifier

results in printing a string. For direct use in regular vsnprintf() the (k)

and (u) annotation is ignored, however, when used out of BPF's bpf_trace_printk(),

for example, it reads the memory it is pointing to without faulting.



Kernel Pointers

---------------