Skip to content

Commit 1b67fd0

Browse files
committed
Merge tag 'kvmarm-fixes-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for Linux 5.9, take #1 - Multiple stolen time fixes, with a new capability to match x86 - Fix for hugetlbfs mappings when PUD and PMD are the same level - Fix for hugetlbfs mappings when PTE mappings are enforced (dirty logging, for example) - Fix tracing output of 64bit values
2 parents b533137 + 7b75cd5 commit 1b67fd0

File tree

2,166 files changed

+52278
-18837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,166 files changed

+52278
-18837
lines changed

.mailmap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
# This list is used by git-shortlog to fix a few botched name translations
33
# in the git archive, either because the author's full name was messed up
44
# and/or not always written the same way, making contributions from the
5-
# same person appearing not to be so or badly displayed.
5+
# same person appearing not to be so or badly displayed. Also allows for
6+
# old email addresses to map to new email addresses.
67
#
8+
# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
9+
#
10+
# Please keep this list dictionary sorted.
11+
#
12+
# This comment is parsed by git-shortlog:
713
# repo-abbrev: /pub/scm/linux/kernel/git/
814
#
9-
1015
Aaron Durbin <[email protected]>
1116
Adam Oldham <[email protected]>
1217
Adam Radford <[email protected]>
@@ -99,6 +104,7 @@ Gerald Schaefer <[email protected]> <[email protected]>
99104
Greg Kroah-Hartman <greg@echidna.(none)>
100105
Greg Kroah-Hartman <[email protected]>
101106
Greg Kroah-Hartman <[email protected]>
107+
102108
103109
104110

Documentation/ABI/testing/sysfs-bus-nfit

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,25 @@ Description:
202202
functions. See the section named 'NVDIMM Root Device _DSMs' in
203203
the ACPI specification.
204204

205+
What: /sys/bus/nd/devices/ndbusX/nfit/firmware_activate_noidle
206+
Date: Apr, 2020
207+
KernelVersion: v5.8
208+
209+
Description:
210+
(RW) The Intel platform implementation of firmware activate
211+
support exposes an option let the platform force idle devices in
212+
the system over the activation event, or trust that the OS will
213+
do it. The safe default is to let the platform force idle
214+
devices since the kernel is already in a suspend state, and on
215+
the chance that a driver does not properly quiesce bus-mastering
216+
after a suspend callback the platform will handle it. However,
217+
the activation might abort if, for example, platform firmware
218+
determines that the activation time exceeds the max PCI-E
219+
completion timeout. Since the platform does not know whether the
220+
OS is running the activation from a suspend context it aborts,
221+
but if the system owner trusts driver suspend callback to be
222+
sufficient then 'firmware_activation_noidle' can be
223+
enabled to bypass the activation abort.
205224

206225
What: /sys/bus/nd/devices/regionX/nfit/range_index
207226
Date: Jun, 2015
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The libnvdimm sub-system implements a common sysfs interface for
2+
platform nvdimm resources. See Documentation/driver-api/nvdimm/.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/i2c/devices/xxx/fw_version
2+
Date: Aug 2020
3+
4+
Description: Reports the firmware version provided by the touchscreen, for example "00_T6" on a EXC80H60
5+
6+
Access: Read
7+
Valid values: Represented as string
8+
9+
What: /sys/bus/i2c/devices/xxx/model
10+
Date: Aug 2020
11+
12+
Description: Reports the model identification provided by the touchscreen, for example "Orion_1320" on a EXC80H60
13+
14+
Access: Read
15+
Valid values: Represented as string

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ Date: August 2017
229229
Contact: "Jaegeuk Kim" <[email protected]>
230230
Description: Do background GC agressively when set. When gc_urgent = 1,
231231
background thread starts to do GC by given gc_urgent_sleep_time
232-
interval. It is set to 0 by default.
232+
interval. When gc_urgent = 2, F2FS will lower the bar of
233+
checking idle in order to process outstanding discard commands
234+
and GC a little bit aggressively. It is set to 0 by default.
233235

234236
What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
235237
Date: August 2017

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,10 @@ PAGE_SIZE multiple when read back.
12741274
Amount of memory used for storing in-kernel data
12751275
structures.
12761276

1277+
percpu
1278+
Amount of memory used for storing per-cpu kernel
1279+
data structures.
1280+
12771281
sock
12781282
Amount of memory used in network transmission buffers
12791283

Documentation/admin-guide/hw-vuln/multihit.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ The possible values in this file are:
8080
- The processor is not vulnerable.
8181
* - KVM: Mitigation: Split huge pages
8282
- Software changes mitigate this issue.
83+
* - KVM: Mitigation: VMX unsupported
84+
- KVM is not vulnerable because Virtual Machine Extensions (VMX) is not supported.
85+
* - KVM: Mitigation: VMX disabled
86+
- KVM is not vulnerable because Virtual Machine Extensions (VMX) is disabled.
8387
* - KVM: Vulnerable
8488
- The processor is vulnerable, but no mitigation enabled
8589

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@
724724
memory region [offset, offset + size] for that kernel
725725
image. If '@offset' is omitted, then a suitable offset
726726
is selected automatically.
727-
[KNL, x86_64] select a region under 4G first, and
727+
[KNL, X86-64] Select a region under 4G first, and
728728
fall back to reserve region above 4G when '@offset'
729729
hasn't been specified.
730730
See Documentation/admin-guide/kdump/kdump.rst for further details.
@@ -737,14 +737,14 @@
737737
Documentation/admin-guide/kdump/kdump.rst for an example.
738738

739739
crashkernel=size[KMG],high
740-
[KNL, x86_64] range could be above 4G. Allow kernel
740+
[KNL, X86-64] range could be above 4G. Allow kernel
741741
to allocate physical memory region from top, so could
742742
be above 4G if system have more than 4G ram installed.
743743
Otherwise memory region will be allocated below 4G, if
744744
available.
745745
It will be ignored if crashkernel=X is specified.
746746
crashkernel=size[KMG],low
747-
[KNL, x86_64] range under 4G. When crashkernel=X,high
747+
[KNL, X86-64] range under 4G. When crashkernel=X,high
748748
is passed, kernel could allocate physical memory region
749749
above 4G, that cause second kernel crash on system
750750
that require some amount of low memory, e.g. swiotlb
@@ -1427,7 +1427,7 @@
14271427

14281428
gamma= [HW,DRM]
14291429

1430-
gart_fix_e820= [X86_64] disable the fix e820 for K8 GART
1430+
gart_fix_e820= [X86-64] disable the fix e820 for K8 GART
14311431
Format: off | on
14321432
default: on
14331433

@@ -1814,15 +1814,15 @@
18141814
Format: 0 | 1
18151815
Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.
18161816

1817-
init_pkru= [x86] Specify the default memory protection keys rights
1817+
init_pkru= [X86] Specify the default memory protection keys rights
18181818
register contents for all processes. 0x55555554 by
18191819
default (disallow access to all but pkey 0). Can
18201820
override in debugfs after boot.
18211821

18221822
inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver
18231823
Format: <irq>
18241824

1825-
int_pln_enable [x86] Enable power limit notification interrupt
1825+
int_pln_enable [X86] Enable power limit notification interrupt
18261826

18271827
integrity_audit=[IMA]
18281828
Format: { "0" | "1" }
@@ -1840,7 +1840,7 @@
18401840
bypassed by not enabling DMAR with this option. In
18411841
this case, gfx device will use physical address for
18421842
DMA.
1843-
forcedac [x86_64]
1843+
forcedac [X86-64]
18441844
With this option iommu will not optimize to look
18451845
for io virtual address below 32-bit forcing dual
18461846
address cycle on pci bus for cards supporting greater
@@ -1925,7 +1925,7 @@
19251925
strict regions from userspace.
19261926
relaxed
19271927

1928-
iommu= [x86]
1928+
iommu= [X86]
19291929
off
19301930
force
19311931
noforce
@@ -1935,8 +1935,8 @@
19351935
merge
19361936
nomerge
19371937
soft
1938-
pt [x86]
1939-
nopt [x86]
1938+
pt [X86]
1939+
nopt [X86]
19401940
nobypass [PPC/POWERNV]
19411941
Disable IOMMU bypass, using IOMMU for PCI devices.
19421942

@@ -2079,21 +2079,21 @@
20792079

20802080
iucv= [HW,NET]
20812081

2082-
ivrs_ioapic [HW,X86_64]
2082+
ivrs_ioapic [HW,X86-64]
20832083
Provide an override to the IOAPIC-ID<->DEVICE-ID
20842084
mapping provided in the IVRS ACPI table. For
20852085
example, to map IOAPIC-ID decimal 10 to
20862086
PCI device 00:14.0 write the parameter as:
20872087
ivrs_ioapic[10]=00:14.0
20882088

2089-
ivrs_hpet [HW,X86_64]
2089+
ivrs_hpet [HW,X86-64]
20902090
Provide an override to the HPET-ID<->DEVICE-ID
20912091
mapping provided in the IVRS ACPI table. For
20922092
example, to map HPET-ID decimal 0 to
20932093
PCI device 00:14.0 write the parameter as:
20942094
ivrs_hpet[0]=00:14.0
20952095

2096-
ivrs_acpihid [HW,X86_64]
2096+
ivrs_acpihid [HW,X86-64]
20972097
Provide an override to the ACPI-HID:UID<->DEVICE-ID
20982098
mapping provided in the IVRS ACPI table. For
20992099
example, to map UART-HID:UID AMD0020:0 to
@@ -2370,7 +2370,7 @@
23702370
lapic [X86-32,APIC] Enable the local APIC even if BIOS
23712371
disabled it.
23722372

2373-
lapic= [x86,APIC] "notscdeadline" Do not use TSC deadline
2373+
lapic= [X86,APIC] "notscdeadline" Do not use TSC deadline
23742374
value for LAPIC timer one-shot implementation. Default
23752375
back to the programmable timer unit in the LAPIC.
23762376

@@ -3188,12 +3188,12 @@
31883188
register save and restore. The kernel will only save
31893189
legacy floating-point registers on task switch.
31903190

3191-
nohugeiomap [KNL,x86,PPC] Disable kernel huge I/O mappings.
3191+
nohugeiomap [KNL,X86,PPC] Disable kernel huge I/O mappings.
31923192

31933193
nosmt [KNL,S390] Disable symmetric multithreading (SMT).
31943194
Equivalent to smt=1.
31953195

3196-
[KNL,x86] Disable symmetric multithreading (SMT).
3196+
[KNL,X86] Disable symmetric multithreading (SMT).
31973197
nosmt=force: Force disable SMT, cannot be undone
31983198
via the sysfs control file.
31993199

@@ -3955,7 +3955,7 @@
39553955
pt. [PARIDE]
39563956
See Documentation/admin-guide/blockdev/paride.rst.
39573957

3958-
pti= [X86_64] Control Page Table Isolation of user and
3958+
pti= [X86-64] Control Page Table Isolation of user and
39593959
kernel address spaces. Disabling this feature
39603960
removes hardening, but improves performance of
39613961
system calls and interrupts.
@@ -3967,7 +3967,7 @@
39673967

39683968
Not specifying this option is equivalent to pti=auto.
39693969

3970-
nopti [X86_64]
3970+
nopti [X86-64]
39713971
Equivalent to pti=off
39723972

39733973
pty.legacy_count=

0 commit comments

Comments
 (0)