Skip to content

Commit a3f794d

Browse files
authored
Merge pull request #99 from microsoft/revert-98-hcl-main.6.12
Revert " Merge tag 'rolling-lts/hcl-main/6.12.42.1' into product/hcl-main/6.12"
2 parents 7be77cf + 82e6ff1 commit a3f794d

File tree

1,096 files changed

+9239
-16432
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,096 files changed

+9239
-16432
lines changed

.clippy.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
msrv = "1.78.0"
4-
53
check-private-items = true
64

75
disallowed-macros = [

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ What: /sys/devices/system/cpu/vulnerabilities
523523
/sys/devices/system/cpu/vulnerabilities/spectre_v1
524524
/sys/devices/system/cpu/vulnerabilities/spectre_v2
525525
/sys/devices/system/cpu/vulnerabilities/srbds
526-
/sys/devices/system/cpu/vulnerabilities/tsa
527526
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
528527
Date: January 2018
529528
Contact: Linux kernel mailing list <[email protected]>

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of
711711

712712
The file is read only.
713713

714-
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
714+
What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
715715
Date: February 2018
716716
Contact: Stanislav Nijnikov <[email protected]>
717717
Description: This file shows the total physical memory resources. This is

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ This is achieved by using the otherwise unused and obsolete VERW instruction in
157157
combination with a microcode update. The microcode clears the affected CPU
158158
buffers when the VERW instruction is executed.
159159

160-
Kernel does the buffer clearing with x86_clear_cpu_buffers().
160+
Kernel reuses the MDS function to invoke the buffer clearing:
161+
162+
mds_clear_cpu_buffers()
161163

162164
On MDS affected CPUs, the kernel already invokes CPU buffer clear on
163165
kernel/userspace, hypervisor/guest and C-state (idle) transitions. No

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6997,19 +6997,6 @@
69976997
having this key zero'ed is acceptable. E.g. in testing
69986998
scenarios.
69996999

7000-
tsa= [X86] Control mitigation for Transient Scheduler
7001-
Attacks on AMD CPUs. Search the following in your
7002-
favourite search engine for more details:
7003-
7004-
"Technical guidance for mitigating transient scheduler
7005-
attacks".
7006-
7007-
off - disable the mitigation
7008-
on - enable the mitigation (default)
7009-
user - mitigate only user/kernel transitions
7010-
vm - mitigate only guest/host transitions
7011-
7012-
70137000
tsc= Disable clocksource stability checks for TSC.
70147001
Format: <string>
70157002
[x86] reliable: mark tsc clocksource as reliable, this

Documentation/arch/x86/mds.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ enters a C-state.
9393

9494
The kernel provides a function to invoke the buffer clearing:
9595

96-
x86_clear_cpu_buffers()
96+
mds_clear_cpu_buffers()
9797

9898
Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path.
9999
Other than CFLAGS.ZF, this macro doesn't clobber any registers.
@@ -185,9 +185,9 @@ Mitigation points
185185
idle clearing would be a window dressing exercise and is therefore not
186186
activated.
187187

188-
The invocation is controlled by the static key cpu_buf_idle_clear which is
189-
switched depending on the chosen mitigation mode and the SMT state of the
190-
system.
188+
The invocation is controlled by the static key mds_idle_clear which is
189+
switched depending on the chosen mitigation mode and the SMT state of
190+
the system.
191191

192192
The buffer clear is only invoked before entering the C-State to prevent
193193
that stale data from the idling CPU from spilling to the Hyper-Thread

Documentation/bpf/map_hash.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,10 @@ attempts in order to enforce the LRU property which have increasing impacts on
233233
other CPUs involved in the following operation attempts:
234234

235235
- Attempt to use CPU-local state to batch operations
236-
- Attempt to fetch ``target_free`` free nodes from global lists
236+
- Attempt to fetch free nodes from global lists
237237
- Attempt to pull any node from a global list and remove it from the hashmap
238238
- Attempt to pull any node from any CPU's list and remove it from the hashmap
239239

240-
The number of nodes to borrow from the global list in a batch, ``target_free``,
241-
depends on the size of the map. Larger batch size reduces lock contention, but
242-
may also exhaust the global structure. The value is computed at map init to
243-
avoid exhaustion, by limiting aggregate reservation by all CPUs to half the map
244-
size. With a minimum of a single element and maximum budget of 128 at a time.
245-
246240
This algorithm is described visually in the following diagram. See the
247241
description in commit 3a08c2fd7634 ("bpf: LRU List") for a full explanation of
248242
the corresponding operations:

Documentation/bpf/map_lru_hash_update.dot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ digraph {
3535
fn_bpf_lru_list_pop_free_to_local [shape=rectangle,fillcolor=2,
3636
label="Flush local pending,
3737
Rotate Global list, move
38-
target_free
38+
LOCAL_FREE_TARGET
3939
from global -> local"]
4040
// Also corresponds to:
4141
// fn__local_list_flush()
4242
// fn_bpf_lru_list_rotate()
4343
fn___bpf_lru_node_move_to_free[shape=diamond,fillcolor=2,
44-
label="Able to free\ntarget_free\nnodes?"]
44+
label="Able to free\nLOCAL_FREE_TARGET\nnodes?"]
4545

4646
fn___bpf_lru_list_shrink_inactive [shape=rectangle,fillcolor=3,
4747
label="Shrink inactive list
4848
up to remaining
49-
target_free
49+
LOCAL_FREE_TARGET
5050
(global LRU -> local)"]
5151
fn___bpf_lru_list_shrink [shape=diamond,fillcolor=2,
5252
label="> 0 entries in\nlocal free list?"]

Documentation/core-api/symbol-namespaces.rst

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ kernel. As of today, modules that make use of symbols exported into namespaces,
2828
are required to import the namespace. Otherwise the kernel will, depending on
2929
its configuration, reject loading the module or warn about a missing import.
3030

31-
Additionally, it is possible to put symbols into a module namespace, strictly
32-
limiting which modules are allowed to use these symbols.
33-
3431
2. How to define Symbol Namespaces
3532
==================================
3633

@@ -87,22 +84,6 @@ unit as preprocessor statement. The above example would then read::
8784
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
8885
used.
8986

90-
2.3 Using the EXPORT_SYMBOL_GPL_FOR_MODULES() macro
91-
===================================================
92-
93-
Symbols exported using this macro are put into a module namespace. This
94-
namespace cannot be imported.
95-
96-
The macro takes a comma separated list of module names, allowing only those
97-
modules to access this symbol. Simple tail-globs are supported.
98-
99-
For example:
100-
101-
EXPORT_SYMBOL_GPL_FOR_MODULES(preempt_notifier_inc, "kvm,kvm-*")
102-
103-
will limit usage of this symbol to modules whoes name matches the given
104-
patterns.
105-
10687
3. How to use Symbols exported in Namespaces
10788
============================================
10889

@@ -174,6 +155,3 @@ in-tree modules::
174155
You can also run nsdeps for external module builds. A typical usage is::
175156

176157
$ make -C <path_to_kernel_src> M=$PWD nsdeps
177-
178-
Note: it will happily generate an import statement for the module namespace;
179-
which will not work and generates build and runtime failures.

Documentation/filesystems/f2fs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota
235235
grpjquota=<file> information can be properly updated during recovery flow,
236236
prjjquota=<file> <quota file>: must be in root directory;
237237
jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
238-
usrjquota= Turn off user journalled quota.
239-
grpjquota= Turn off group journalled quota.
240-
prjjquota= Turn off project journalled quota.
238+
offusrjquota Turn off user journalled quota.
239+
offgrpjquota Turn off group journalled quota.
240+
offprjjquota Turn off project journalled quota.
241241
quota Enable plain user disk quota accounting.
242242
noquota Disable all plain disk quota option.
243243
alloc_mode=%s Adjust block allocation policy, which supports "reuse"

0 commit comments

Comments
 (0)