Skip to content

Commit bc3012f

Browse files
torvaldstorvalds
committed
Merge tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Add virtual-address based lskcipher interface - Optimise ahash/shash performance in light of costly indirect calls - Remove ahash alignmask attribute Algorithms: - Improve AES/XTS performance of 6-way unrolling for ppc - Remove some uses of obsolete algorithms (md4, md5, sha1) - Add FIPS 202 SHA-3 support in pkcs1pad - Add fast path for single-page messages in adiantum - Remove zlib-deflate Drivers: - Add support for S4 in meson RNG driver - Add STM32MP13x support in stm32 - Add hwrng interface support in qcom-rng - Add support for deflate algorithm in hisilicon/zip" * tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (283 commits) crypto: adiantum - flush destination page before unmapping crypto: testmgr - move pkcs1pad(rsa,sha3-*) to correct place Documentation/module-signing.txt: bring up to date module: enable automatic module signing with FIPS 202 SHA-3 crypto: asymmetric_keys - allow FIPS 202 SHA-3 signatures crypto: rsa-pkcs1pad - Add FIPS 202 SHA-3 support crypto: FIPS 202 SHA-3 register in hash info for IMA x509: Add OIDs for FIPS 202 SHA-3 hash and signatures crypto: ahash - optimize performance when wrapping shash crypto: ahash - check for shash type instead of not ahash type crypto: hash - move "ahash wrapping shash" functions to ahash.c crypto: talitos - stop using crypto_ahash::init crypto: chelsio - stop using crypto_ahash::init crypto: ahash - improve file comment crypto: ahash - remove struct ahash_request_priv crypto: ahash - remove crypto_ahash_alignmask crypto: gcm - stop using alignmask of ahash crypto: chacha20poly1305 - stop using alignmask of ahash crypto: ccm - stop using alignmask of ahash net: ipv6: stop checking crypto_ahash_alignmask ...
2 parents 6803bd7 + a312e07 commit bc3012f

File tree

275 files changed

+10670
-3331
lines changed

Some content is hidden

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

275 files changed

+10670
-3331
lines changed

‎Documentation/ABI/testing/debugfs-driver-qat

+23-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/kernel/debug/qat_<device>_<BDF>/qat/fw_counters
1+
What: /sys/kernel/debug/qat_<device>_<BDF>/fw_counters
22
Date: November 2023
33
KernelVersion: 6.6
44
Contact: [email protected]
@@ -59,3 +59,25 @@ Description: (RO) Read returns the device health status.
5959

6060
The driver does not monitor for Heartbeat. It is left for a user
6161
to poll the status periodically.
62+
63+
What: /sys/kernel/debug/qat_<device>_<BDF>/pm_status
64+
Date: January 2024
65+
KernelVersion: 6.7
66+
Contact: [email protected]
67+
Description: (RO) Read returns power management information specific to the
68+
QAT device.
69+
70+
This attribute is only available for qat_4xxx devices.
71+
72+
What: /sys/kernel/debug/qat_<device>_<BDF>/cnv_errors
73+
Date: January 2024
74+
KernelVersion: 6.7
75+
Contact: [email protected]
76+
Description: (RO) Read returns, for each Acceleration Engine (AE), the number
77+
of errors and the type of the last error detected by the device
78+
when performing verified compression.
79+
Reported counters::
80+
81+
<N>: Number of Compress and Verify (CnV) errors and type
82+
of the last CnV error detected by Acceleration
83+
Engine N.

‎Documentation/ABI/testing/sysfs-driver-qat

+48
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Description: (RW) Reports the current configuration of the QAT device.
2929
services
3030
* asym;sym: identical to sym;asym
3131
* dc: the device is configured for running compression services
32+
* dcc: identical to dc but enables the dc chaining feature,
33+
hash then compression. If this is not required chose dc
3234
* sym: the device is configured for running symmetric crypto
3335
services
3436
* asym: the device is configured for running asymmetric crypto
@@ -93,3 +95,49 @@ Description: (RW) This configuration option provides a way to force the device i
9395
0
9496

9597
This attribute is only available for qat_4xxx devices.
98+
99+
What: /sys/bus/pci/devices/<BDF>/qat/rp2srv
100+
Date: January 2024
101+
KernelVersion: 6.7
102+
Contact: [email protected]
103+
Description:
104+
(RW) This attribute provides a way for a user to query a
105+
specific ring pair for the type of service that it is currently
106+
configured for.
107+
108+
When written to, the value is cached and used to perform the
109+
read operation. Allowed values are in the range 0 to N-1, where
110+
N is the max number of ring pairs supported by a device. This
111+
can be queried using the attribute qat/num_rps.
112+
113+
A read returns the service associated to the ring pair queried.
114+
115+
The values are:
116+
117+
* dc: the ring pair is configured for running compression services
118+
* sym: the ring pair is configured for running symmetric crypto
119+
services
120+
* asym: the ring pair is configured for running asymmetric crypto
121+
services
122+
123+
Example usage::
124+
125+
# echo 1 > /sys/bus/pci/devices/<BDF>/qat/rp2srv
126+
# cat /sys/bus/pci/devices/<BDF>/qat/rp2srv
127+
sym
128+
129+
This attribute is only available for qat_4xxx devices.
130+
131+
What: /sys/bus/pci/devices/<BDF>/qat/num_rps
132+
Date: January 2024
133+
KernelVersion: 6.7
134+
Contact: [email protected]
135+
Description:
136+
(RO) Returns the number of ring pairs that a single device has.
137+
138+
Example usage::
139+
140+
# cat /sys/bus/pci/devices/<BDF>/qat/num_rps
141+
64
142+
143+
This attribute is only available for qat_4xxx devices.

‎Documentation/ABI/testing/sysfs-driver-qat_ras

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
What: /sys/bus/pci/devices/<BDF>/qat_ras/errors_correctable
2+
Date: January 2024
3+
KernelVersion: 6.7
4+
Contact: [email protected]
5+
Description: (RO) Reports the number of correctable errors detected by the device.
6+
7+
This attribute is only available for qat_4xxx devices.
8+
9+
What: /sys/bus/pci/devices/<BDF>/qat_ras/errors_nonfatal
10+
Date: January 2024
11+
KernelVersion: 6.7
12+
Contact: [email protected]
13+
Description: (RO) Reports the number of non fatal errors detected by the device.
14+
15+
This attribute is only available for qat_4xxx devices.
16+
17+
What: /sys/bus/pci/devices/<BDF>/qat_ras/errors_fatal
18+
Date: January 2024
19+
KernelVersion: 6.7
20+
Contact: [email protected]
21+
Description: (RO) Reports the number of fatal errors detected by the device.
22+
23+
This attribute is only available for qat_4xxx devices.
24+
25+
What: /sys/bus/pci/devices/<BDF>/qat_ras/reset_error_counters
26+
Date: January 2024
27+
KernelVersion: 6.7
28+
Contact: [email protected]
29+
Description: (WO) Write to resets all error counters of a device.
30+
31+
The following example reports how to reset the counters::
32+
33+
# echo 1 > /sys/bus/pci/devices/<BDF>/qat_ras/reset_error_counters
34+
# cat /sys/bus/pci/devices/<BDF>/qat_ras/errors_correctable
35+
0
36+
# cat /sys/bus/pci/devices/<BDF>/qat_ras/errors_nonfatal
37+
0
38+
# cat /sys/bus/pci/devices/<BDF>/qat_ras/errors_fatal
39+
0
40+
41+
This attribute is only available for qat_4xxx devices.

‎Documentation/ABI/testing/sysfs-driver-qat_rl

+226
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
What: /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
2+
Date: January 2024
3+
KernelVersion: 6.7
4+
Contact: [email protected]
5+
Description:
6+
(WO) This attribute is used to perform an operation on an SLA.
7+
The supported operations are: add, update, rm, rm_all, and get.
8+
9+
Input values must be filled through the associated attribute in
10+
this group before a write to this file.
11+
If the operation completes successfully, the associated
12+
attributes will be updated.
13+
The associated attributes are: cir, pir, srv, rp, and id.
14+
15+
Supported operations:
16+
17+
* add: Creates a new SLA with the provided inputs from user.
18+
* Inputs: cir, pir, srv, and rp
19+
* Output: id
20+
21+
* get: Returns the configuration of the specified SLA in id attribute
22+
* Inputs: id
23+
* Outputs: cir, pir, srv, and rp
24+
25+
* update: Updates the SLA with new values set in the following attributes
26+
* Inputs: id, cir, and pir
27+
28+
* rm: Removes the specified SLA in the id attribute.
29+
* Inputs: id
30+
31+
* rm_all: Removes all the configured SLAs.
32+
* Inputs: None
33+
34+
This attribute is only available for qat_4xxx devices.
35+
36+
What: /sys/bus/pci/devices/<BDF>/qat_rl/rp
37+
Date: January 2024
38+
KernelVersion: 6.7
39+
Contact: [email protected]
40+
Description:
41+
(RW) When read, reports the current assigned ring pairs for the
42+
queried SLA.
43+
When wrote to, configures the ring pairs associated to a new SLA.
44+
45+
The value is a 64-bit bit mask and is written/displayed in hex.
46+
Each bit of this mask represents a single ring pair i.e.,
47+
bit 1 == ring pair id 0; bit 3 == ring pair id 2.
48+
49+
Selected ring pairs must to be assigned to a single service,
50+
i.e. the one provided with the srv attribute. The service
51+
assigned to a certain ring pair can be checked by querying
52+
the attribute qat/rp2srv.
53+
54+
The maximum number of ring pairs is 4 per SLA.
55+
56+
Applicability in sla_op:
57+
58+
* WRITE: add operation
59+
* READ: get operation
60+
61+
Example usage::
62+
63+
## Read
64+
# echo 4 > /sys/bus/pci/devices/<BDF>/qat_rl/id
65+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/rp
66+
0x5
67+
68+
## Write
69+
# echo 0x5 > /sys/bus/pci/devices/<BDF>/qat_rl/rp
70+
71+
This attribute is only available for qat_4xxx devices.
72+
73+
What: /sys/bus/pci/devices/<BDF>/qat_rl/id
74+
Date: January 2024
75+
KernelVersion: 6.7
76+
Contact: [email protected]
77+
Description:
78+
(RW) If written to, the value is used to retrieve a particular
79+
SLA and operate on it.
80+
This is valid only for the following operations: update, rm,
81+
and get.
82+
A read of this attribute is only guaranteed to have correct data
83+
after creation of an SLA.
84+
85+
Applicability in sla_op:
86+
87+
* WRITE: rm and update operations
88+
* READ: add and get operations
89+
90+
Example usage::
91+
92+
## Read
93+
## Set attributes e.g. cir, pir, srv, etc
94+
# echo "add" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
95+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/id
96+
4
97+
98+
## Write
99+
# echo 7 > /sys/bus/pci/devices/<BDF>/qat_rl/id
100+
# echo "get" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
101+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/rp
102+
0x5 ## ring pair ID 0 and ring pair ID 2
103+
104+
This attribute is only available for qat_4xxx devices.
105+
106+
What: /sys/bus/pci/devices/<BDF>/qat_rl/cir
107+
Date: January 2024
108+
KernelVersion: 6.7
109+
Contact: [email protected]
110+
Description:
111+
(RW) Committed information rate (CIR). Rate guaranteed to be
112+
achieved by a particular SLA. The value is expressed in
113+
permille scale, i.e. 1000 refers to the maximum device
114+
throughput for a selected service.
115+
116+
After sending a "get" to sla_op, this will be populated with the
117+
CIR for that queried SLA.
118+
Write to this file before sending an "add/update" sla_op, to set
119+
the SLA to the specified value.
120+
121+
Applicability in sla_op:
122+
123+
* WRITE: add and update operations
124+
* READ: get operation
125+
126+
Example usage::
127+
128+
## Write
129+
# echo 500 > /sys/bus/pci/devices/<BDF>/qat_rl/cir
130+
# echo "add" /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
131+
132+
## Read
133+
# echo 4 > /sys/bus/pci/devices/<BDF>/qat_rl/id
134+
# echo "get" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
135+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/cir
136+
500
137+
138+
This attribute is only available for qat_4xxx devices.
139+
140+
What: /sys/bus/pci/devices/<BDF>/qat_rl/pir
141+
Date: January 2024
142+
KernelVersion: 6.7
143+
Contact: [email protected]
144+
Description:
145+
(RW) Peak information rate (PIR). The maximum rate that can be
146+
achieved by that particular SLA. An SLA can reach a value
147+
between CIR and PIR when the device is not fully utilized by
148+
requests from other users (assigned to different SLAs).
149+
150+
After sending a "get" to sla_op, this will be populated with the
151+
PIR for that queried SLA.
152+
Write to this file before sending an "add/update" sla_op, to set
153+
the SLA to the specified value.
154+
155+
Applicability in sla_op:
156+
157+
* WRITE: add and update operations
158+
* READ: get operation
159+
160+
Example usage::
161+
162+
## Write
163+
# echo 750 > /sys/bus/pci/devices/<BDF>/qat_rl/pir
164+
# echo "add" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
165+
166+
## Read
167+
# echo 4 > /sys/bus/pci/devices/<BDF>/qat_rl/id
168+
# echo "get" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
169+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/pir
170+
750
171+
172+
This attribute is only available for qat_4xxx devices.
173+
174+
What: /sys/bus/pci/devices/<BDF>/qat_rl/srv
175+
Date: January 2024
176+
KernelVersion: 6.7
177+
Contact: [email protected]
178+
Description:
179+
(RW) Service (SRV). Represents the service (sym, asym, dc)
180+
associated to an SLA.
181+
Can be written to or queried to set/show the SRV type for an SLA.
182+
The SRV attribute is used to specify the SRV type before adding
183+
an SLA. After an SLA is configured, reports the service
184+
associated to that SLA.
185+
186+
Applicability in sla_op:
187+
188+
* WRITE: add and update operations
189+
* READ: get operation
190+
191+
Example usage::
192+
193+
## Write
194+
# echo "dc" > /sys/bus/pci/devices/<BDF>/qat_rl/srv
195+
# echo "add" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
196+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/id
197+
4
198+
199+
## Read
200+
# echo 4 > /sys/bus/pci/devices/<BDF>/qat_rl/id
201+
# echo "get" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
202+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/srv
203+
dc
204+
205+
This attribute is only available for qat_4xxx devices.
206+
207+
What: /sys/bus/pci/devices/<BDF>/qat_rl/cap_rem
208+
Date: January 2024
209+
KernelVersion: 6.7
210+
Contact: [email protected]
211+
Description:
212+
(RW) This file will return the remaining capability for a
213+
particular service/sla. This is the remaining value that a new
214+
SLA can be set to or a current SLA can be increased with.
215+
216+
Example usage::
217+
218+
# echo "asym" > /sys/bus/pci/devices/<BDF>/qat_rl/cap_rem
219+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/cap_rem
220+
250
221+
# echo 250 > /sys/bus/pci/devices/<BDF>/qat_rl/cir
222+
# echo "add" > /sys/bus/pci/devices/<BDF>/qat_rl/sla_op
223+
# cat /sys/bus/pci/devices/<BDF>/qat_rl/cap_rem
224+
0
225+
226+
This attribute is only available for qat_4xxx devices.

0 commit comments

Comments
 (0)