Commit 33436335 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEAD 

KVM/riscv changes for 6.3

- Fix wrong usage of PGDIR_SIZE to check page sizes
- Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()
- Redirect illegal instruction traps to guest
- SBI PMU support for guest
parents 27b025eb c39cea6f

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>
@@ -214,6 +215,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com> 
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
@@ -371,6 +373,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
@@ -422,6 +425,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

+15 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author) 
D: APM driver (early port)

D: DRM drivers (author of several)



N: Veaceslav Falico

E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -2489,6 +2493,13 @@ D: XF86_Mach8 
D: XF86_8514

D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA



N: John S. Marvin

E: jsm@fc.hp.com

D: PA-RISC port
@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu 
S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China



N: Vlad Yasevich

E: vyasevich@gmail.com

D: SCTP protocol maintainer.



N: Aviad Yehezkel

E: aviadye@nvidia.com

D: Kernel TLS implementation and offload support.

Documentation/admin-guide/cgroup-v2.rst

+6 −9
Original line number Diff line number Diff line
@@ -1245,13 +1245,17 @@ PAGE_SIZE multiple when read back. 
	This is a simple interface to trigger memory reclaim in the

	target cgroup.



	This file accepts a string which contains the number of bytes to

	reclaim.

	This file accepts a single key, the number of bytes to reclaim.

	No nested keys are currently supported.



	Example::



	  echo "1G" > memory.reclaim



	The interface can be later extended with nested keys to

	configure the reclaim behavior. For example, specify the

	type of memory to reclaim from (anon, file, ..).



	Please note that the kernel can over or under reclaim from

	the target cgroup. If less bytes are reclaimed than the

	specified amount, -EAGAIN is returned.
@@ -1263,13 +1267,6 @@ PAGE_SIZE multiple when read back. 
	This means that the networking layer will not adapt based on

	reclaim induced by memory.reclaim.



	This file also allows the user to specify the nodes to reclaim from,

	via the 'nodes=' key, for example::



	  echo "1G nodes=0,1" > memory.reclaim



	The above instructs the kernel to reclaim memory from nodes 0,1.



  memory.peak

	A read-only single value file which exists on non-root

	cgroups.

Documentation/admin-guide/mm/zswap.rst

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ e.g. ``zswap.zpool=zbud``. It can also be changed at runtime using the sysfs 
The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which

means the compression ratio will always be 2:1 or worse (because of half-full

zbud pages).  The zsmalloc type zpool has a more complex compressed page

storage method, and it can achieve greater storage densities.  However,

zsmalloc does not implement compressed page eviction, so once zswap fills it

cannot evict the oldest page, it can only reject new pages.

storage method, and it can achieve greater storage densities.



When a swap page is passed from frontswap to zswap, zswap maintains a mapping

of the swap entry, a combination of the swap type and swap offset, to the zpool

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2224489        | ARM64_ERRATUM_2224489       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A715     | #2645198        | ARM64_ERRATUM_2645198       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-X2       | #2119858        | ARM64_ERRATUM_2119858       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-X2       | #2224489        | ARM64_ERRATUM_2224489       |