Skip to content

Commit e1bcad6

Browse files
author
Peter Zijlstra
committed
Merge branch 'tip/x86/entry'
2 parents c935cd6 + b037b09 commit e1bcad6

File tree

1,251 files changed

+11131
-6413
lines changed

Some content is hidden

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

1,251 files changed

+11131
-6413
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ x509.genkey
143143
/allrandom.config
144144
/allyes.config
145145

146+
# Kconfig savedefconfig output
147+
/defconfig
148+
146149
# Kdevelop4
147150
*.kdev4
148151

‎Documentation/ABI/testing/dev-kmsg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ Description: The /dev/kmsg character device node provides userspace access
5656
seek after the last record available at the time
5757
the last SYSLOG_ACTION_CLEAR was issued.
5858

59-
Due to the record nature of this interface with a "read all"
60-
behavior and the specific positions each seek operation sets,
61-
SEEK_CUR is not supported, returning -ESPIPE (invalid seek) to
62-
errno whenever requested.
63-
6459
The output format consists of a prefix carrying the syslog
6560
prefix including priority and facility, the 64 bit message
6661
sequence number and the monotonic timestamp in microseconds,

‎Documentation/ABI/testing/sysfs-bus-papr-pmem

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/bus/nd/devices/nmemX/papr/flags
2+
Date: Apr, 2020
3+
KernelVersion: v5.8
4+
Contact: linuxppc-dev <[email protected]>, [email protected],
5+
Description:
6+
(RO) Report flags indicating various states of a
7+
papr-pmem NVDIMM device. Each flag maps to a one or
8+
more bits set in the dimm-health-bitmap retrieved in
9+
response to H_SCM_HEALTH hcall. The details of the bit
10+
flags returned in response to this hcall is available
11+
at 'Documentation/powerpc/papr_hcalls.rst' . Below are
12+
the flags reported in this sysfs file:
13+
14+
* "not_armed" : Indicates that NVDIMM contents will not
15+
survive a power cycle.
16+
* "flush_fail" : Indicates that NVDIMM contents
17+
couldn't be flushed during last
18+
shut-down event.
19+
* "restore_fail": Indicates that NVDIMM contents
20+
couldn't be restored during NVDIMM
21+
initialization.
22+
* "encrypted" : NVDIMM contents are encrypted.
23+
* "smart_notify": There is health event for the NVDIMM.
24+
* "scrubbed" : Indicating that contents of the
25+
NVDIMM have been scrubbed.
26+
* "locked" : Indicating that NVDIMM contents cant
27+
be modified until next power cycle.

‎Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
22
Date: Feb 2014
3-
Contact: Li Jun <b47624@freescale.com>
3+
Contact: Li Jun <jun.li@nxp.com>
44
Description:
55
Can be set and read.
66
Set a_bus_req(A-device bus request) input to be 1 if
@@ -17,7 +17,7 @@ Description:
1717

1818
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
1919
Date: Feb 2014
20-
Contact: Li Jun <b47624@freescale.com>
20+
Contact: Li Jun <jun.li@nxp.com>
2121
Description:
2222
Can be set and read
2323
The a_bus_drop(A-device bus drop) input is 1 when the
@@ -32,7 +32,7 @@ Description:
3232

3333
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
3434
Date: Feb 2014
35-
Contact: Li Jun <b47624@freescale.com>
35+
Contact: Li Jun <jun.li@nxp.com>
3636
Description:
3737
Can be set and read.
3838
The b_bus_req(B-device bus request) input is 1 during the time
@@ -47,7 +47,7 @@ Description:
4747

4848
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
4949
Date: Feb 2014
50-
Contact: Li Jun <b47624@freescale.com>
50+
Contact: Li Jun <jun.li@nxp.com>
5151
Description:
5252
Only can be set.
5353
The a_clr_err(A-device Vbus error clear) input is used to clear

‎Documentation/admin-guide/cgroup-v2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back.
13561356

13571357
thp_fault_alloc
13581358
Number of transparent hugepages which were allocated to satisfy
1359-
a page fault, including COW faults. This counter is not present
1360-
when CONFIG_TRANSPARENT_HUGEPAGE is not set.
1359+
a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE
1360+
is not set.
13611361

13621362
thp_collapse_alloc
13631363
Number of transparent hugepages which were allocated to allow

‎Documentation/admin-guide/device-mapper/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Device Mapper
1111
dm-clone
1212
dm-crypt
1313
dm-dust
14+
dm-ebs
1415
dm-flakey
1516
dm-init
1617
dm-integrity

‎Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use.
305305

306306
thp_fault_alloc
307307
is incremented every time a huge page is successfully
308-
allocated to handle a page fault. This applies to both the
309-
first time a page is faulted and for COW faults.
308+
allocated to handle a page fault.
310309

311310
thp_collapse_alloc
312311
is incremented by khugepaged when it has found

‎Documentation/arm64/silicon-errata.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ stable kernels.
147147
+----------------+-----------------+-----------------+-----------------------------+
148148
| Qualcomm Tech. | Falkor v{1,2} | E1041 | QCOM_FALKOR_ERRATUM_1041 |
149149
+----------------+-----------------+-----------------+-----------------------------+
150+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1463225 |
151+
+----------------+-----------------+-----------------+-----------------------------+
152+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1418040 |
153+
+----------------+-----------------+-----------------+-----------------------------+
154+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1530923 |
155+
+----------------+-----------------+-----------------+-----------------------------+
156+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
157+
+----------------+-----------------+-----------------+-----------------------------+
150158
+----------------+-----------------+-----------------+-----------------------------+
151159
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
152160
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/arm64/sve.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
186186

187187
flags:
188188

189-
PR_SVE_SET_VL_INHERIT
189+
PR_SVE_VL_INHERIT
190190

191191
Inherit the current vector length across execve(). Otherwise, the
192192
vector length is reset to the system default at execve(). (See
@@ -247,7 +247,7 @@ prctl(PR_SVE_GET_VL)
247247

248248
The following flag may be OR-ed into the result:
249249

250-
PR_SVE_SET_VL_INHERIT
250+
PR_SVE_VL_INHERIT
251251

252252
Vector length will be inherited across execve().
253253

@@ -393,7 +393,7 @@ The regset data starts with struct user_sve_header, containing:
393393
* At every execve() call, the new vector length of the new process is set to
394394
the system default vector length, unless
395395

396-
* PR_SVE_SET_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
396+
* PR_SVE_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
397397
calling thread, or
398398

399399
* a deferred vector length change is pending, established via the

‎Documentation/bpf/prog_cgroup_sockopt.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,20 @@ then the next program in the chain (A) will see those changes,
8686
*not* the original input ``setsockopt`` arguments. The potentially
8787
modified values will be then passed down to the kernel.
8888

89+
Large optval
90+
============
91+
When the ``optval`` is greater than the ``PAGE_SIZE``, the BPF program
92+
can access only the first ``PAGE_SIZE`` of that data. So it has to options:
93+
94+
* Set ``optlen`` to zero, which indicates that the kernel should
95+
use the original buffer from the userspace. Any modifications
96+
done by the BPF program to the ``optval`` are ignored.
97+
* Set ``optlen`` to the value less than ``PAGE_SIZE``, which
98+
indicates that the kernel should use BPF's trimmed ``optval``.
99+
100+
When the BPF program returns with the ``optlen`` greater than
101+
``PAGE_SIZE``, the userspace will receive ``EFAULT`` errno.
102+
89103
Example
90104
=======
91105

0 commit comments

Comments
 (0)