Commit 44024adb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Bugfixes and improvements to selftests.

  On top of this, Mauro converted the KVM documentation to rst format,
  which was very welcome"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (44 commits)
  docs: virt: guest-halt-polling.txt convert to ReST
  docs: kvm: review-checklist.txt: rename to ReST
  docs: kvm: Convert timekeeping.txt to ReST format
  docs: kvm: Convert s390-diag.txt to ReST format
  docs: kvm: Convert ppc-pv.txt to ReST format
  docs: kvm: Convert nested-vmx.txt to ReST format
  docs: kvm: Convert mmu.txt to ReST format
  docs: kvm: Convert locking.txt to ReST format
  docs: kvm: Convert hypercalls.txt to ReST format
  docs: kvm: arm/psci.txt: convert to ReST
  docs: kvm: convert arm/hyp-abi.txt to ReST
  docs: kvm: Convert api.txt to ReST format
  docs: kvm: convert devices/xive.txt to ReST
  docs: kvm: convert devices/xics.txt to ReST
  docs: kvm: convert devices/vm.txt to ReST
  docs: kvm: convert devices/vfio.txt to ReST
  docs: kvm: convert devices/vcpu.txt to ReST
  docs: kvm: convert devices/s390_flic.txt to ReST
  docs: kvm: convert devices/mpic.txt to ReST
  docs: kvm: convert devices/arm-vgit.txt to ReST
  ...
parents b982df72 120881b9

Documentation/virtual/guest-halt-polling.txt→Documentation/virt/guest-halt-polling.rst

+9 −3
Original line number Diff line number Diff line 
==================

Guest halt polling

==================



The cpuidle_haltpoll driver, with the haltpoll governor, allows

the guest vcpus to poll for a specified amount of time before

halting.



This provides the following benefits to host side polling:



	1) The POLL flag is set while polling is performed, which allows
@@ -29,18 +31,21 @@ Module Parameters 
The haltpoll governor has 5 tunable module parameters:



1) guest_halt_poll_ns:



Maximum amount of time, in nanoseconds, that polling is

performed before halting.



Default: 200000



2) guest_halt_poll_shrink:



Division factor used to shrink per-cpu guest_halt_poll_ns when

wakeup event occurs after the global guest_halt_poll_ns.



Default: 2



3) guest_halt_poll_grow:



Multiplication factor used to grow per-cpu guest_halt_poll_ns

when event occurs after per-cpu guest_halt_poll_ns

but before global guest_halt_poll_ns.
@@ -48,6 +53,7 @@ but before global guest_halt_poll_ns. 
Default: 2



4) guest_halt_poll_grow_start:



The per-cpu guest_halt_poll_ns eventually reaches zero

in case of an idle system. This value sets the initial

per-cpu guest_halt_poll_ns when growing. This can
@@ -66,7 +72,7 @@ high once achieves global guest_halt_poll_ns value). 


Default: Y



The module parameters can be set from the debugfs files in:

The module parameters can be set from the debugfs files in::



	/sys/module/haltpoll/parameters/
@@ -74,5 +80,5 @@ Further Notes 
=============



- Care should be taken when setting the guest_halt_poll_ns parameter as a

large value has the potential to drive the cpu usage to 100% on a machine which

would be almost entirely idle otherwise.
 
  large value has the potential to drive the cpu usage to 100% on a machine

  which would be almost entirely idle otherwise.

Documentation/virt/index.rst

+2 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ Linux Virtualization Support 
   :maxdepth: 2



   kvm/index

   uml/user_mode_linux

   paravirt_ops

   guest-halt-polling



.. only:: html and subproject

Documentation/virt/kvm/api.txt→Documentation/virt/kvm/api.rst

+1963 −1387

File changed and moved.

Preview size limit exceeded, changes collapsed.

Documentation/virt/kvm/arm/hyp-abi.txt→Documentation/virt/kvm/arm/hyp-abi.rst

+19 −9
Original line number Diff line number Diff line 
* Internal ABI between the kernel and HYP

.. SPDX-License-Identifier: GPL-2.0



=======================================

Internal ABI between the kernel and HYP

=======================================



This file documents the interaction between the Linux kernel and the

hypervisor layer when running Linux as a hypervisor (for example
@@ -19,7 +23,9 @@ and only act on individual CPUs. 
Unless specified otherwise, any built-in hypervisor must implement

these functions (see arch/arm{,64}/include/asm/virt.h):



* r0/x0 = HVC_SET_VECTORS

* ::



    r0/x0 = HVC_SET_VECTORS

    r1/x1 = vectors



  Set HVBAR/VBAR_EL2 to 'vectors' to enable a hypervisor. 'vectors'
@@ -27,13 +33,17 @@ these functions (see arch/arm{,64}/include/asm/virt.h): 
  of the architecture. Only implemented by the initial stubs, not by

  Linux hypervisors.



* r0/x0 = HVC_RESET_VECTORS

* ::



    r0/x0 = HVC_RESET_VECTORS



  Turn HYP/EL2 MMU off, and reset HVBAR/VBAR_EL2 to the initials

  stubs' exception vector value. This effectively disables an existing

  hypervisor.



* r0/x0 = HVC_SOFT_RESTART

* ::



    r0/x0 = HVC_SOFT_RESTART

    r1/x1 = restart address

    x2 = x0's value when entering the next payload (arm64)

    x3 = x1's value when entering the next payload (arm64)

Documentation/virt/kvm/arm/index.rst

0 → 100644
+12 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



===

ARM

===



.. toctree::

   :maxdepth: 2



   hyp-abi

   psci

   pvtime

CRA Git | Maintained and supported by SUSTech CRA and CCSE