Commit db6efda8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tee-fixes-for-v5.4' of... 

Merge tag 'tee-fixes-for-v5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Two OP-TE driver fixes:
- Add proper cleanup on optee_enumerate_devices() failure
- Make sure to register kernel allocations of dynamic shared memory

* tag 'tee-fixes-for-v5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee: (591 commits)
  tee: optee: fix device enumeration error handling
  tee: optee: Fix dynamic shm pool allocations
  Linux 5.4-rc3
  tracing: Initialize iter->seq after zeroing in tracing_read_pipe()
  tracing/hwlat: Don't ignore outer-loop duration when calculating max_latency
  tracing/hwlat: Report total time spent in all NMIs during the sample
  recordmcount: Fix nop_mcount() function
  tracing: Do not create tracefs files if tracefs lockdown is in effect
  tracing: Add locked_down checks to the open calls of files created for tracefs
  tracing: Add tracing_check_open_get_tr()
  tracing: Have trace events system open call tracing_open_generic_tr()
  tracing: Get trace_array reference for available_tracers files
  ftrace: Get a reference counter for the trace_array on filter files
  tracefs: Revert ccbd54ff ("tracefs: Restrict tracefs when the kernel is locked down")
  perf/x86/cstate: Add Tiger Lake CPU support
  perf/x86/msr: Add Tiger Lake CPU support
  perf/x86/intel: Add Tiger Lake CPU support
  perf/x86/cstate: Update C-state counters for Ice Lake
  perf/x86/msr: Add new CPU model numbers for Ice Lake
  perf/x86/cstate: Add Comet Lake CPU support
  ...

Link: https://lore.kernel.org/r/20191115105353.GA26176@jax


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 002d3c65 03212e34

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer



N: Christopher Horn

E: chorn@warwick.net

D: Miscellaneous sysctl hacks

Documentation/admin-guide/cgroup-v2.rst

+14 −6
Original line number Diff line number Diff line
@@ -615,8 +615,8 @@ on an IO device and is an example of this type. 
Protections

-----------



A cgroup is protected to be allocated upto the configured amount of

the resource if the usages of all its ancestors are under their

A cgroup is protected upto the configured amount of the resource

as long as the usages of all its ancestors are under their

protected levels.  Protections can be hard guarantees or best effort

soft boundaries.  Protections can also be over-committed in which case

only upto the amount available to the parent is protected among
@@ -1096,7 +1096,10 @@ PAGE_SIZE multiple when read back. 
	is within its effective min boundary, the cgroup's memory

	won't be reclaimed under any conditions. If there is no

	unprotected reclaimable memory available, OOM killer

	is invoked.

	is invoked. Above the effective min boundary (or

	effective low boundary if it is higher), pages are reclaimed

	proportionally to the overage, reducing reclaim pressure for

	smaller overages.



       Effective min boundary is limited by memory.min values of

	all ancestor cgroups. If there is memory.min overcommitment
@@ -1118,7 +1121,10 @@ PAGE_SIZE multiple when read back. 
	Best-effort memory protection.  If the memory usage of a

	cgroup is within its effective low boundary, the cgroup's

	memory won't be reclaimed unless memory can be reclaimed

	from unprotected cgroups.

	from unprotected cgroups.  Above the effective low boundary (or

	effective min boundary if it is higher), pages are reclaimed

	proportionally to the overage, reducing reclaim pressure for

	smaller overages.



	Effective low boundary is limited by memory.low values of

	all ancestor cgroups. If there is memory.low overcommitment
@@ -2482,8 +2488,10 @@ system performance due to overreclaim, to the point where the feature 
becomes self-defeating.



The memory.low boundary on the other hand is a top-down allocated

reserve.  A cgroup enjoys reclaim protection when it's within its low,

which makes delegation of subtrees possible.

reserve.  A cgroup enjoys reclaim protection when it's within its

effective low, which makes delegation of subtrees possible. It also

enjoys having reclaim pressure proportional to its overage when

above its effective low.



The original high boundary, the hard limit, is defined as a strict

limit that can not budge, even if the OOM killer has to be called.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -5302,6 +5302,10 @@ 
				the unplug protocol

			never -- do not unplug even if version check succeeds



	xen_legacy_crash	[X86,XEN]

			Crash from Xen panic notifier, without executing late

			panic() code such as dumping handler.



	xen_nopvspin	[X86,XEN]

			Disables the ticketlock slowpath using Xen PV

			optimizations.

Documentation/arm64/memory.rst

+8 −1
Original line number Diff line number Diff line
@@ -154,11 +154,18 @@ return virtual addresses to userspace from a 48-bit range. 


Software can "opt-in" to receiving VAs from a 52-bit space by

specifying an mmap hint parameter that is larger than 48-bit.



For example:



.. code-block:: c



   maybe_high_address = mmap(~0UL, size, prot, flags,...);



It is also possible to build a debug kernel that returns addresses

from a 52-bit space by enabling the following kernel config options:



.. code-block:: sh



   CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y



Note that this option is only intended for debugging applications

Documentation/core-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ Core utilities 
   protection-keys

   ../RCU/index

   gcc-plugins

   symbol-namespaces





Interfaces for kernel debugging