Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f24ee1c99412578650eec7bc83e42bcbb3601ed9..d9c171ce4190845950e7c14e362265b4d26adc74 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1862,6 +1862,18 @@
                        for all guests.
                        Default is 1 (enabled) if in 64-bit or 32-bit PAE mode.
 
+       kvm-arm.vgic_v3_group0_trap=
+                       [KVM,ARM] Trap guest accesses to GICv3 group-0
+                       system registers
+
+       kvm-arm.vgic_v3_group1_trap=
+                       [KVM,ARM] Trap guest accesses to GICv3 group-1
+                       system registers
+
+       kvm-arm.vgic_v3_common_trap=
+                       [KVM,ARM] Trap guest accesses to GICv3 common
+                       system registers
+
        kvm-intel.ept=  [KVM,Intel] Disable extended page tables
                        (virtualized MMU) support on capable Intel chips.
                        Default is 1 (enabled)
@@ -2303,8 +2315,11 @@
                        that the amount of memory usable for all allocations
                        is not too small.
 
-       movable_node    [KNL] Boot-time switch to enable the effects
-                       of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
+       movable_node    [KNL] Boot-time switch to make hotplugable memory
+                       NUMA nodes to be movable. This means that the memory
+                       of such nodes will be usable only for movable
+                       allocations which rules out almost all kernel
+                       allocations. Use with caution!
 
        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
@@ -3760,8 +3775,14 @@
        slab_nomerge    [MM]
                        Disable merging of slabs with similar size. May be
                        necessary if there is some reason to distinguish
-                       allocs to different slabs. Debug options disable
-                       merging on their own.
+                       allocs to different slabs, especially in hardened
+                       environments where the risk of heap overflows and
+                       layout control by attackers can usually be
+                       frustrated by disabling merging. This will reduce
+                       most of the exposure of a heap attack to a single
+                       cache (risks via metadata attacks are mostly
+                       unchanged). Debug options disable merging on their
+                       own.
                        For more information see Documentation/vm/slub.txt.
 
        slab_max_order= [MM, SLAB]