Skip to content

Commit 76889bb

Browse files
committed
Merge branch 'nesting_reserved_regions' into iommufd.git for-next
Nicolin Chen says: ========= IOMMU_RESV_SW_MSI is a unique region defined by an IOMMU driver. Though it is eventually used by a device for address translation to an MSI location (including nested cases), practically it is a universal region across all domains allocated for the IOMMU that defines it. Currently IOMMUFD core fetches and reserves the region during an attach to an hwpt_paging. It works with a hwpt_paging-only case, but might not work with a nested case where a device could directly attach to a hwpt_nested, bypassing the hwpt_paging attachment. Move the enforcement forward, to the hwpt_paging allocation function. Then clean up all the SW_MSI related things in the attach/replace routine. ========= Based on v6.11-rc5 for dependencies. * nesting_reserved_regions: (562 commits) iommufd/device: Enforce reserved IOVA also when attached to hwpt_nested Linux 6.11-rc5 ...
2 parents 79ea4a4 + b2f4481 commit 76889bb

File tree

663 files changed

+8154
-4068
lines changed

Some content is hidden

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

663 files changed

+8154
-4068
lines changed

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT)
562562
================ =========================================
563563

564564
If control status is "forceoff" or "notsupported" writes
565-
are rejected.
565+
are rejected. Note that enabling SMT on PowerPC skips
566+
offline cores.
566567

567568
What: /sys/devices/system/cpu/cpuX/power/energy_perf_bias
568569
Date: March 2019

Documentation/admin-guide/device-mapper/dm-crypt.rst

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,14 @@ iv_large_sectors
162162

163163

164164
Module parameters::
165-
max_read_size
166-
max_write_size
167-
Maximum size of read or write requests. When a request larger than this size
168-
is received, dm-crypt will split the request. The splitting improves
169-
concurrency (the split requests could be encrypted in parallel by multiple
170-
cores), but it also causes overhead. The user should tune these parameters to
171-
fit the actual workload.
165+
166+
max_read_size
167+
max_write_size
168+
Maximum size of read or write requests. When a request larger than this size
169+
is received, dm-crypt will split the request. The splitting improves
170+
concurrency (the split requests could be encrypted in parallel by multiple
171+
cores), but it also causes overhead. The user should tune these parameters to
172+
fit the actual workload.
172173

173174

174175
Example scripts

Documentation/arch/riscv/hwprobe.rst

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,25 +239,33 @@ The following keys are defined:
239239
ratified in commit 98918c844281 ("Merge pull request #1217 from
240240
riscv/zawrs") of riscv-isa-manual.
241241

242-
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance
243-
information about the selected set of processors.
242+
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: Deprecated. Returns similar values to
243+
:c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`, but the key was
244+
mistakenly classified as a bitmask rather than a value.
244245

245-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNKNOWN`: The performance of misaligned
246-
accesses is unknown.
246+
* :c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`: An enum value describing
247+
the performance of misaligned scalar native word accesses on the selected set
248+
of processors.
247249

248-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_EMULATED`: Misaligned accesses are
249-
emulated via software, either in or below the kernel. These accesses are
250-
always extremely slow.
250+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNKNOWN`: The performance of
251+
misaligned scalar accesses is unknown.
251252

252-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SLOW`: Misaligned accesses are slower
253-
than equivalent byte accesses. Misaligned accesses may be supported
254-
directly in hardware, or trapped and emulated by software.
253+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED`: Misaligned scalar
254+
accesses are emulated via software, either in or below the kernel. These
255+
accesses are always extremely slow.
255256

256-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_FAST`: Misaligned accesses are faster
257-
than equivalent byte accesses.
257+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_SLOW`: Misaligned scalar native
258+
word sized accesses are slower than the equivalent quantity of byte
259+
accesses. Misaligned accesses may be supported directly in hardware, or
260+
trapped and emulated by software.
258261

259-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNSUPPORTED`: Misaligned accesses are
260-
not supported at all and will generate a misaligned address fault.
262+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_FAST`: Misaligned scalar native
263+
word sized accesses are faster than the equivalent quantity of byte
264+
accesses.
265+
266+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNSUPPORTED`: Misaligned scalar
267+
accesses are not supported at all and will generate a misaligned address
268+
fault.
261269

262270
* :c:macro:`RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE`: An unsigned int which
263271
represents the size of the Zicboz block in bytes.

Documentation/core-api/workqueue.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Some users depend on strict execution ordering where only one work item
260260
is in flight at any given time and the work items are processed in
261261
queueing order. While the combination of ``@max_active`` of 1 and
262262
``WQ_UNBOUND`` used to achieve this behavior, this is no longer the
263-
case. Use ``alloc_ordered_queue()`` instead.
263+
case. Use alloc_ordered_workqueue() instead.
264264

265265

266266
Example Execution Scenarios

Documentation/devicetree/bindings/clock/qcom,dispcc-sm6350.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display Clock & Reset Controller on SM6350
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm display clock control module provides the clocks, resets and power

Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on MSM8994
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

Documentation/devicetree/bindings/clock/qcom,gcc-sm6125.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on SM6125
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

Documentation/devicetree/bindings/clock/qcom,gcc-sm6350.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Global Clock & Reset Controller on SM6350
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@somainline.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power

Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM6115
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides clocks, resets and power

Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Graphics Clock & Reset Controller on SM6125
88

99
maintainers:
10-
- Konrad Dybcio <konrad.dybcio@linaro.org>
10+
- Konrad Dybcio <konradybcio@kernel.org>
1111

1212
description: |
1313
Qualcomm graphics clock control module provides clocks and power domains on

0 commit comments

Comments
 (0)