Skip to content

Commit 8a2094d

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.17/core' into for-linus
- support for USI style pens (Tero Kristo, Mika Westerberg) - quirk for devices that need inverted X/Y axes (Alistair Francis) - small core code cleanups and deduplication (Benjamin Tissoires)
2 parents 3809fe4 + b60d3c8 commit 8a2094d

3,151 files changed

Lines changed: 90489 additions & 49953 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,13 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
7171
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
7272
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
7373
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
74+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
75+
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
76+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
7477
Christophe Ricard <christophe.ricard@gmail.com>
7578
Christoph Hellwig <hch@lst.de>
79+
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
80+
Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
7681
Corey Minyard <minyard@acm.org>
7782
Damian Hobson-Garcia <dhobsong@igel.co.jp>
7883
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Documentation/ABI/testing/sysfs-bus-pci

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,17 @@ Description:
100100
This attribute indicates the mode that the irq vector named by
101101
the file is in (msi vs. msix)
102102

103+
What: /sys/bus/pci/devices/.../irq
104+
Date: August 2021
105+
Contact: Linux PCI developers <linux-pci@vger.kernel.org>
106+
Description:
107+
If a driver has enabled MSI (not MSI-X), "irq" contains the
108+
IRQ of the first MSI vector. Otherwise "irq" contains the
109+
IRQ of the legacy INTx interrupt.
110+
111+
"irq" being set to 0 indicates that the device isn't
112+
capable of generating legacy INTx interrupts.
113+
103114
What: /sys/bus/pci/devices/.../remove
104115
Date: January 2009
105116
Contact: Linux PCI developers <linux-pci@vger.kernel.org>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/class/fc/fc_udev_device/appid_store
2+
Date: Aug 2021
3+
Contact: Muneendra Kumar <muneendra.kumar@broadconm.com>
4+
Description:
5+
This interface allows an admin to set an FC application
6+
identifier in the blkcg associated with a cgroup id. The
7+
identifier is typically a UUID that is associated with
8+
an application or logical entity such as a virtual
9+
machine or container group. The application or logical
10+
entity utilizes a block device via the cgroup id.
11+
FC adapter drivers may query the identifier and tag FC
12+
traffic based on the identifier. FC host and FC fabric
13+
entities can utilize the application id and FC traffic
14+
tag to identify traffic sources.
15+
16+
The interface expects a string "<cgroupid>:<appid>" where:
17+
<cgroupid> is inode of the cgroup in hexadecimal
18+
<appid> is user provided string upto 128 characters
19+
in length.
20+
21+
If an appid_store is done for a cgroup id that already
22+
has an appid set, the new value will override the
23+
previous value.
24+
25+
If an admin wants to remove an FC application identifier
26+
from a cgroup, an appid_store should be done with the
27+
following string: "<cgroupid>:"

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ Description: This file shows the amount of data that the host plans to
983983
What: /sys/class/scsi_device/*/device/dyn_cap_needed
984984
Date: February 2018
985985
Contact: Stanislav Nijnikov <stanislav.nijnikov@wdc.com>
986-
Description: This file shows the The amount of physical memory needed
986+
Description: This file shows the amount of physical memory needed
987987
to be removed from the physical memory resources pool of
988988
the particular logical unit. The full information about
989989
the attribute could be found at UFS specifications 2.1.

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,3 +512,19 @@ Date: July 2021
512512
Contact: "Daeho Jeong" <daehojeong@google.com>
513513
Description: You can control the multiplier value of bdi device readahead window size
514514
between 2 (default) and 256 for POSIX_FADV_SEQUENTIAL advise option.
515+
516+
What: /sys/fs/f2fs/<disk>/max_fragment_chunk
517+
Date: August 2021
518+
Contact: "Daeho Jeong" <daehojeong@google.com>
519+
Description: With "mode=fragment:block" mount options, we can scatter block allocation.
520+
f2fs will allocate 1..<max_fragment_chunk> blocks in a chunk and make a hole
521+
in the length of 1..<max_fragment_hole> by turns. This value can be set
522+
between 1..512 and the default value is 4.
523+
524+
What: /sys/fs/f2fs/<disk>/max_fragment_hole
525+
Date: August 2021
526+
Contact: "Daeho Jeong" <daehojeong@google.com>
527+
Description: With "mode=fragment:block" mount options, we can scatter block allocation.
528+
f2fs will allocate 1..<max_fragment_chunk> blocks in a chunk and make a hole
529+
in the length of 1..<max_fragment_hole> by turns. This value can be set
530+
between 1..512 and the default value is 4.

Documentation/admin-guide/blockdev/zram.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,14 @@ as idle::
328328
From now on, any pages on zram are idle pages. The idle mark
329329
will be removed until someone requests access of the block.
330330
IOW, unless there is access request, those pages are still idle pages.
331+
Additionally, when CONFIG_ZRAM_MEMORY_TRACKING is enabled pages can be
332+
marked as idle based on how long (in seconds) it's been since they were
333+
last accessed::
334+
335+
echo 86400 > /sys/block/zramX/idle
336+
337+
In this example all pages which haven't been accessed in more than 86400
338+
seconds (one day) will be marked idle.
331339

332340
Admin can request writeback of those idle pages at right timing via::
333341

Documentation/admin-guide/cgroup-v1/memory.rst

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ Brief summary of control files.
8787
memory.oom_control set/show oom controls.
8888
memory.numa_stat show the number of memory usage per numa
8989
node
90-
memory.kmem.limit_in_bytes set/show hard limit for kernel memory
91-
This knob is deprecated and shouldn't be
92-
used. It is planned that this be removed in
93-
the foreseeable future.
90+
memory.kmem.limit_in_bytes This knob is deprecated and writing to
91+
it will return -ENOTSUPP.
9492
memory.kmem.usage_in_bytes show current kernel memory allocation
9593
memory.kmem.failcnt show the number of kernel memory usage
9694
hits limits
@@ -518,11 +516,6 @@ will be charged as a new owner of it.
518516
charged file caches. Some out-of-use page caches may keep charged until
519517
memory pressure happens. If you want to avoid that, force_empty will be useful.
520518

521-
Also, note that when memory.kmem.limit_in_bytes is set the charges due to
522-
kernel pages will still be seen. This is not considered a failure and the
523-
write will still return success. In this case, it is expected that
524-
memory.kmem.usage_in_bytes == memory.usage_in_bytes.
525-
526519
5.2 stat file
527520
-------------
528521

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
====================================
4+
File system Monitoring with fanotify
5+
====================================
6+
7+
File system Error Reporting
8+
===========================
9+
10+
Fanotify supports the FAN_FS_ERROR event type for file system-wide error
11+
reporting. It is meant to be used by file system health monitoring
12+
daemons, which listen for these events and take actions (notify
13+
sysadmin, start recovery) when a file system problem is detected.
14+
15+
By design, a FAN_FS_ERROR notification exposes sufficient information
16+
for a monitoring tool to know a problem in the file system has happened.
17+
It doesn't necessarily provide a user space application with semantics
18+
to verify an IO operation was successfully executed. That is out of
19+
scope for this feature. Instead, it is only meant as a framework for
20+
early file system problem detection and reporting recovery tools.
21+
22+
When a file system operation fails, it is common for dozens of kernel
23+
errors to cascade after the initial failure, hiding the original failure
24+
log, which is usually the most useful debug data to troubleshoot the
25+
problem. For this reason, FAN_FS_ERROR tries to report only the first
26+
error that occurred for a file system since the last notification, and
27+
it simply counts additional errors. This ensures that the most
28+
important pieces of information are never lost.
29+
30+
FAN_FS_ERROR requires the fanotify group to be setup with the
31+
FAN_REPORT_FID flag.
32+
33+
At the time of this writing, the only file system that emits FAN_FS_ERROR
34+
notifications is Ext4.
35+
36+
A FAN_FS_ERROR Notification has the following format::
37+
38+
::
39+
40+
[ Notification Metadata (Mandatory) ]
41+
[ Generic Error Record (Mandatory) ]
42+
[ FID record (Mandatory) ]
43+
44+
The order of records is not guaranteed, and new records might be added
45+
in the future. Therefore, applications must not rely on the order and
46+
must be prepared to skip over unknown records. Please refer to
47+
``samples/fanotify/fs-monitor.c`` for an example parser.
48+
49+
Generic error record
50+
--------------------
51+
52+
The generic error record provides enough information for a file system
53+
agnostic tool to learn about a problem in the file system, without
54+
providing any additional details about the problem. This record is
55+
identified by ``struct fanotify_event_info_header.info_type`` being set
56+
to FAN_EVENT_INFO_TYPE_ERROR.
57+
58+
::
59+
60+
struct fanotify_event_info_error {
61+
struct fanotify_event_info_header hdr;
62+
__s32 error;
63+
__u32 error_count;
64+
};
65+
66+
The `error` field identifies the type of error using errno values.
67+
`error_count` tracks the number of errors that occurred and were
68+
suppressed to preserve the original error information, since the last
69+
notification.
70+
71+
FID record
72+
----------
73+
74+
The FID record can be used to uniquely identify the inode that triggered
75+
the error through the combination of fsid and file handle. A file system
76+
specific application can use that information to attempt a recovery
77+
procedure. Errors that are not related to an inode are reported with an
78+
empty file handle of type FILEID_INVALID.

Documentation/admin-guide/hw-vuln/core-scheduling.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ arg3:
6161
``pid`` of the task for which the operation applies.
6262

6363
arg4:
64-
``pid_type`` for which the operation applies. It is of type ``enum pid_type``.
65-
For example, if arg4 is ``PIDTYPE_TGID``, then the operation of this command
64+
``pid_type`` for which the operation applies. It is one of
65+
``PR_SCHED_CORE_SCOPE_``-prefixed macro constants. For example, if arg4
66+
is ``PR_SCHED_CORE_SCOPE_THREAD_GROUP``, then the operation of this command
6667
will be performed for all tasks in the task group of ``pid``.
6768

6869
arg5:

Documentation/admin-guide/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ configure specific aspects of kernel behavior to your liking.
8282
edid
8383
efi-stub
8484
ext4
85+
filesystem-monitoring
8586
nfs/index
8687
gpio/index
8788
highuid

0 commit comments

Comments
 (0)