Skip to content

Commit df44b1e

Browse files
committed
Merge branch 'for-5.20/selftests-fixes' into for-next
2 parents 0e11f20 + 55eb9a6 commit df44b1e

File tree

12,987 files changed

+1047652
-272896
lines changed

Some content is hidden

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

12,987 files changed

+1047652
-272896
lines changed

.clang-format

Lines changed: 170 additions & 48 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
*.symversions
4646
*.tab.[ch]
4747
*.tar
48+
*.usyms
4849
*.xz
4950
*.zst
5051
Module.symvers

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
4545
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4646
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
4747
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
48+
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
4849
Andy Adamson <andros@citi.umich.edu>
4950
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
5051
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
@@ -204,6 +205,7 @@ Juha Yrjola <at solidboot.com>
204205
Juha Yrjola <juha.yrjola@nokia.com>
205206
Juha Yrjola <juha.yrjola@solidboot.com>
206207
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
208+
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
207209
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
208210
Kay Sievers <kay.sievers@vrfy.org>
209211
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
@@ -213,6 +215,7 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
213215
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
214216
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
215217
Kenneth W Chen <kenneth.w.chen@intel.com>
218+
Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>
216219
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
217220
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
218221
Koushik <raghavendra.koushik@neterion.com>
@@ -248,6 +251,7 @@ Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
248251
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
249252
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
250253
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
254+
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
251255
Mathieu Othacehe <m.othacehe@gmail.com>
252256
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
253257
Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -390,6 +394,11 @@ Uwe Kleine-König <ukleinek@strlen.de>
390394
Uwe Kleine-König <ukl@pengutronix.de>
391395
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
392396
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
397+
Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>
398+
Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>
399+
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>
400+
Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>
401+
Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
393402
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
394403
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
395404
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,3 +467,39 @@ Description: These files provide the maximum powered required for line card
467467
feeding and line card configuration Id.
468468

469469
The files are read only.
470+
471+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/phy_reset
472+
Date: May 2022
473+
KernelVersion: 5.19
474+
Contact: Vadim Pasternak <vadimpmellanox.com>
475+
Description: This file allows to reset PHY 88E1548 when attribute is set 0
476+
due to some abnormal PHY behavior.
477+
Expected behavior:
478+
When phy_reset is written 1, all PHY 88E1548 are released
479+
from the reset state, when 0 - are hold in reset state.
480+
481+
The files are read/write.
482+
483+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/mac_reset
484+
Date: May 2022
485+
KernelVersion: 5.19
486+
Contact: Vadim Pasternak <vadimpmellanox.com>
487+
Description: This file allows to reset ASIC MT52132 when attribute is set 0
488+
due to some abnormal ASIC behavior.
489+
Expected behavior:
490+
When mac_reset is written 1, the ASIC MT52132 is released
491+
from the reset state, when 0 - is hold in reset state.
492+
493+
The files are read/write.
494+
495+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/qsfp_pwr_good
496+
Date: May 2022
497+
KernelVersion: 5.19
498+
Contact: Vadim Pasternak <vadimpmellanox.com>
499+
Description: This file shows QSFP ports power status. The value is set to 0
500+
when one of any QSFP ports is plugged. The value is set to 1 when
501+
there are no any QSFP ports are plugged.
502+
The possible values are:
503+
0 - Power good, 1 - Not power good.
504+
505+
The files are read only.

Documentation/ABI/testing/debugfs-hisi-hpre

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,20 @@ Description: Dump the status of the QM.
104104
Four states: initiated, started, stopped and closed.
105105
Available for both PF and VF, and take no other effect on HPRE.
106106

107+
What: /sys/kernel/debug/hisi_hpre/<bdf>/qm/diff_regs
108+
Date: Mar 2022
109+
Contact: linux-crypto@vger.kernel.org
110+
Description: QM debug registers(regs) read hardware register value. This
111+
node is used to show the change of the qm register values. This
112+
node can be help users to check the change of register values.
113+
114+
What: /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/diff_regs
115+
Date: Mar 2022
116+
Contact: linux-crypto@vger.kernel.org
117+
Description: HPRE debug registers(regs) read hardware register value. This
118+
node is used to show the change of the register values. This
119+
node can be help users to check the change of register values.
120+
107121
What: /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/send_cnt
108122
Date: Apr 2020
109123
Contact: linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ Description: Dump the status of the QM.
8484
Four states: initiated, started, stopped and closed.
8585
Available for both PF and VF, and take no other effect on SEC.
8686

87+
What: /sys/kernel/debug/hisi_sec2/<bdf>/qm/diff_regs
88+
Date: Mar 2022
89+
Contact: linux-crypto@vger.kernel.org
90+
Description: QM debug registers(regs) read hardware register value. This
91+
node is used to show the change of the qm register values. This
92+
node can be help users to check the change of register values.
93+
94+
What: /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/diff_regs
95+
Date: Mar 2022
96+
Contact: linux-crypto@vger.kernel.org
97+
Description: SEC debug registers(regs) read hardware register value. This
98+
node is used to show the change of the register values. This
99+
node can be help users to check the change of register values.
100+
87101
What: /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/send_cnt
88102
Date: Apr 2020
89103
Contact: linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-zip

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,20 @@ Description: Dump the status of the QM.
9797
Four states: initiated, started, stopped and closed.
9898
Available for both PF and VF, and take no other effect on ZIP.
9999

100+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/diff_regs
101+
Date: Mar 2022
102+
Contact: linux-crypto@vger.kernel.org
103+
Description: QM debug registers(regs) read hardware register value. This
104+
node is used to show the change of the qm registers value. This
105+
node can be help users to check the change of register values.
106+
107+
What: /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/diff_regs
108+
Date: Mar 2022
109+
Contact: linux-crypto@vger.kernel.org
110+
Description: ZIP debug registers(regs) read hardware register value. This
111+
node is used to show the change of the registers value. this
112+
node can be help users to check the change of register values.
113+
100114
What: /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/send_cnt
101115
Date: Apr 2020
102116
Contact: linux-crypto@vger.kernel.org

Documentation/ABI/testing/ima_policy

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ Description:
2727
[fowner=] [fgroup=]]
2828
lsm: [[subj_user=] [subj_role=] [subj_type=]
2929
[obj_user=] [obj_role=] [obj_type=]]
30-
option: [[appraise_type=]] [template=] [permit_directio]
31-
[appraise_flag=] [appraise_algos=] [keyrings=]
30+
option: [digest_type=] [template=] [permit_directio]
31+
[appraise_type=] [appraise_flag=]
32+
[appraise_algos=] [keyrings=]
3233
base:
3334
func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]
3435
[FIRMWARE_CHECK]
@@ -47,10 +48,21 @@ Description:
4748
fgroup:= decimal value
4849
lsm: are LSM specific
4950
option:
50-
appraise_type:= [imasig] [imasig|modsig]
51+
appraise_type:= [imasig] | [imasig|modsig] | [sigv3]
52+
where 'imasig' is the original or the signature
53+
format v2.
54+
where 'modsig' is an appended signature,
55+
where 'sigv3' is the signature format v3. (Currently
56+
limited to fsverity digest based signatures
57+
stored in security.ima xattr. Requires
58+
specifying "digest_type=verity" first.)
59+
5160
appraise_flag:= [check_blacklist]
5261
Currently, blacklist check is only for files signed with appended
5362
signature.
63+
digest_type:= verity
64+
Require fs-verity's file digest instead of the
65+
regular IMA file hash.
5466
keyrings:= list of keyrings
5567
(eg, .builtin_trusted_keys|.ima). Only valid
5668
when action is "measure" and func is KEY_CHECK.
@@ -149,3 +161,30 @@ Description:
149161
security.ima xattr of a file:
150162

151163
appraise func=SETXATTR_CHECK appraise_algos=sha256,sha384,sha512
164+
165+
Example of a 'measure' rule requiring fs-verity's digests
166+
with indication of type of digest in the measurement list.
167+
168+
measure func=FILE_CHECK digest_type=verity \
169+
template=ima-ngv2
170+
171+
Example of 'measure' and 'appraise' rules requiring fs-verity
172+
signatures (format version 3) stored in security.ima xattr.
173+
174+
The 'measure' rule specifies the 'ima-sigv3' template option,
175+
which includes the indication of type of digest and the file
176+
signature in the measurement list.
177+
178+
measure func=BPRM_CHECK digest_type=verity \
179+
template=ima-sigv3
180+
181+
182+
The 'appraise' rule specifies the type and signature format
183+
version (sigv3) required.
184+
185+
appraise func=BPRM_CHECK digest_type=verity \
186+
appraise_type=sigv3
187+
188+
All of these policy rules could, for example, be constrained
189+
either based on a filesystem's UUID (fsuuid) or based on LSM
190+
labels.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
What: security/secrets/coco
2+
Date: February 2022
3+
Contact: Dov Murik <dovmurik@linux.ibm.com>
4+
Description:
5+
Exposes confidential computing (coco) EFI secrets to
6+
userspace via securityfs.
7+
8+
EFI can declare memory area used by confidential computing
9+
platforms (such as AMD SEV and SEV-ES) for secret injection by
10+
the Guest Owner during VM's launch. The secrets are encrypted
11+
by the Guest Owner and decrypted inside the trusted enclave,
12+
and therefore are not readable by the untrusted host.
13+
14+
The efi_secret module exposes the secrets to userspace. Each
15+
secret appears as a file under <securityfs>/secrets/coco,
16+
where the filename is the GUID of the entry in the secrets
17+
table. This module is loaded automatically by the EFI driver
18+
if the EFI secret area is populated.
19+
20+
Two operations are supported for the files: read and unlink.
21+
Reading the file returns the content of secret entry.
22+
Unlinking the file overwrites the secret data with zeroes and
23+
removes the entry from the filesystem. A secret cannot be read
24+
after it has been unlinked.
25+
26+
For example, listing the available secrets::
27+
28+
# modprobe efi_secret
29+
# ls -l /sys/kernel/security/secrets/coco
30+
-r--r----- 1 root root 0 Jun 28 11:54 736870e5-84f0-4973-92ec-06879ce3da0b
31+
-r--r----- 1 root root 0 Jun 28 11:54 83c83f7f-1356-4975-8b7e-d3a0b54312c6
32+
-r--r----- 1 root root 0 Jun 28 11:54 9553f55d-3da2-43ee-ab5d-ff17f78864d2
33+
-r--r----- 1 root root 0 Jun 28 11:54 e6f5a162-d67f-4750-a67c-5d065f2a9910
34+
35+
Reading the secret data by reading a file::
36+
37+
# cat /sys/kernel/security/secrets/coco/e6f5a162-d67f-4750-a67c-5d065f2a9910
38+
the-content-of-the-secret-data
39+
40+
Wiping a secret by unlinking a file::
41+
42+
# rm /sys/kernel/security/secrets/coco/e6f5a162-d67f-4750-a67c-5d065f2a9910
43+
# ls -l /sys/kernel/security/secrets/coco
44+
-r--r----- 1 root root 0 Jun 28 11:54 736870e5-84f0-4973-92ec-06879ce3da0b
45+
-r--r----- 1 root root 0 Jun 28 11:54 83c83f7f-1356-4975-8b7e-d3a0b54312c6
46+
-r--r----- 1 root root 0 Jun 28 11:54 9553f55d-3da2-43ee-ab5d-ff17f78864d2
47+
48+
Note: The binary format of the secrets table injected by the
49+
Guest Owner is described in
50+
drivers/virt/coco/efi_secret/efi_secret.c under "Structure of
51+
the EFI secret area".

Documentation/ABI/testing/sysfs-bus-nvdimm

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,38 @@ Description:
66

77
The libnvdimm sub-system implements a common sysfs interface for
88
platform nvdimm resources. See Documentation/driver-api/nvdimm/.
9+
10+
What: /sys/bus/event_source/devices/nmemX/format
11+
Date: February 2022
12+
KernelVersion: 5.18
13+
Contact: Kajol Jain <kjain@linux.ibm.com>
14+
Description: (RO) Attribute group to describe the magic bits
15+
that go into perf_event_attr.config for a particular pmu.
16+
(See ABI/testing/sysfs-bus-event_source-devices-format).
17+
18+
Each attribute under this group defines a bit range of the
19+
perf_event_attr.config. Supported attribute is listed
20+
below::
21+
event = "config:0-4" - event ID
22+
23+
For example::
24+
ctl_res_cnt = "event=0x1"
25+
26+
What: /sys/bus/event_source/devices/nmemX/events
27+
Date: February 2022
28+
KernelVersion: 5.18
29+
Contact: Kajol Jain <kjain@linux.ibm.com>
30+
Description: (RO) Attribute group to describe performance monitoring events
31+
for the nvdimm memory device. Each attribute in this group
32+
describes a single performance monitoring event supported by
33+
this nvdimm pmu. The name of the file is the name of the event.
34+
(See ABI/testing/sysfs-bus-event_source-devices-events). A
35+
listing of the events supported by a given nvdimm provider type
36+
can be found in Documentation/driver-api/nvdimm/$provider.
37+
38+
What: /sys/bus/event_source/devices/nmemX/cpumask
39+
Date: February 2022
40+
KernelVersion: 5.18
41+
Contact: Kajol Jain <kjain@linux.ibm.com>
42+
Description: (RO) This sysfs file exposes the cpumask which is designated to
43+
to retrieve nvdimm pmu event counter data.

0 commit comments

Comments
 (0)