Skip to content

Commit 424e82c

Browse files
fbqfbq
committed
Conflicts: rust/bindings/bindings_helper.h
2 parents 678c7d0 + 7f8851d commit 424e82c

File tree

1,515 files changed

+22249
-12785
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,515 files changed

+22249
-12785
lines changed

‎.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

‎.mailmap

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <[email protected]> <[email protected]>
7272
Andrzej Hajda <[email protected]> <[email protected]>
7373
André Almeida <[email protected]> <[email protected]>
7474
Andy Adamson <[email protected]>
75+
Andy Shevchenko <[email protected]> <[email protected]>
76+
Andy Shevchenko <[email protected]> <[email protected]>
7577
Anilkumar Kolli <[email protected]> <[email protected]>
7678
Anirudh Ghayal <[email protected]> <[email protected]>
7779
Antoine Tenart <[email protected]> <[email protected]>
@@ -217,6 +219,7 @@ Geliang Tang <[email protected]> <[email protected]>
217219
Geliang Tang <[email protected]> <[email protected]>
218220
Geliang Tang <[email protected]> <[email protected]>
219221
Geliang Tang <[email protected]> <[email protected]>
222+
Geliang Tang <[email protected]> <[email protected]>
220223
Georgi Djakov <[email protected]> <[email protected]>
221224
Gerald Schaefer <[email protected]> <[email protected]>
222225
Gerald Schaefer <[email protected]> <[email protected]>
@@ -337,10 +340,11 @@ Kalyan Thota <[email protected]> <[email protected]>
337340
Karthikeyan Periyasamy <[email protected]> <[email protected]>
338341
Kathiravan T <[email protected]> <[email protected]>
339342
Kay Sievers <[email protected]>
340-
Kees Cook <[email protected]> <[email protected]>
341-
Kees Cook <[email protected]> <[email protected]>
342-
Kees Cook <[email protected]> <[email protected]>
343-
Kees Cook <[email protected]> <[email protected]>
343+
Kees Cook <[email protected]> <[email protected]>
344+
Kees Cook <[email protected]> <[email protected]>
345+
Kees Cook <[email protected]> <[email protected]>
346+
Kees Cook <[email protected]> <[email protected]>
347+
Kees Cook <[email protected]> <[email protected]>
344348
Keith Busch <[email protected]> <[email protected]>
345349
Keith Busch <[email protected]> <[email protected]>
346350
Kenneth W Chen <[email protected]>
@@ -604,6 +608,7 @@ Simon Kelley <[email protected]>
604608
Sricharan Ramabadhran <[email protected]> <[email protected]>
605609
Srinivas Ramana <[email protected]> <[email protected]>
606610
Sriram R <[email protected]> <[email protected]>
611+
Stanislav Fomichev <[email protected]> <[email protected]>
607612
Stefan Wahren <[email protected]> <[email protected]>
608613
Stéphane Witzmann <[email protected]>
609614
Stephen Hemminger <[email protected]> <[email protected]>

‎Documentation/ABI/stable/sysfs-block

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,59 @@ Description:
2121
device is offset from the internal allocation unit's
2222
natural alignment.
2323

24+
What: /sys/block/<disk>/atomic_write_max_bytes
25+
Date: February 2024
26+
Contact: Himanshu Madhani <[email protected]>
27+
Description:
28+
[RO] This parameter specifies the maximum atomic write
29+
size reported by the device. This parameter is relevant
30+
for merging of writes, where a merged atomic write
31+
operation must not exceed this number of bytes.
32+
This parameter may be greater than the value in
33+
atomic_write_unit_max_bytes as
34+
atomic_write_unit_max_bytes will be rounded down to a
35+
power-of-two and atomic_write_unit_max_bytes may also be
36+
limited by some other queue limits, such as max_segments.
37+
This parameter - along with atomic_write_unit_min_bytes
38+
and atomic_write_unit_max_bytes - will not be larger than
39+
max_hw_sectors_kb, but may be larger than max_sectors_kb.
40+
41+
42+
What: /sys/block/<disk>/atomic_write_unit_min_bytes
43+
Date: February 2024
44+
Contact: Himanshu Madhani <[email protected]>
45+
Description:
46+
[RO] This parameter specifies the smallest block which can
47+
be written atomically with an atomic write operation. All
48+
atomic write operations must begin at a
49+
atomic_write_unit_min boundary and must be multiples of
50+
atomic_write_unit_min. This value must be a power-of-two.
51+
52+
53+
What: /sys/block/<disk>/atomic_write_unit_max_bytes
54+
Date: February 2024
55+
Contact: Himanshu Madhani <[email protected]>
56+
Description:
57+
[RO] This parameter defines the largest block which can be
58+
written atomically with an atomic write operation. This
59+
value must be a multiple of atomic_write_unit_min and must
60+
be a power-of-two. This value will not be larger than
61+
atomic_write_max_bytes.
62+
63+
64+
What: /sys/block/<disk>/atomic_write_boundary_bytes
65+
Date: February 2024
66+
Contact: Himanshu Madhani <[email protected]>
67+
Description:
68+
[RO] A device may need to internally split an atomic write I/O
69+
which straddles a given logical block address boundary. This
70+
parameter specifies the size in bytes of the atomic boundary if
71+
one is reported by the device. This value must be a
72+
power-of-two and at least the size as in
73+
atomic_write_unit_max_bytes.
74+
Any attempt to merge atomic write I/Os must not result in a
75+
merged I/O which crosses this boundary (if any).
76+
2477

2578
What: /sys/block/<disk>/diskseq
2679
Date: February 2021

‎Documentation/admin-guide/LSM/tomoyo.rst

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
99

1010
LiveCD-based tutorials are available at
1111

12-
http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html
13-
http://tomoyo.sourceforge.jp/1.8/centos6-live.html
12+
https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html
13+
https://tomoyo.sourceforge.net/1.8/centos6-live.html
1414

1515
Though these tutorials use non-LSM version of TOMOYO, they are useful for you
1616
to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO?
2121
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
2222
kernel's command line.
2323

24-
Please see http://tomoyo.osdn.jp/2.5/ for details.
24+
Please see https://tomoyo.sourceforge.net/2.6/ for details.
2525

2626
Where is documentation?
2727
=======================
2828

2929
User <-> Kernel interface documentation is available at
30-
https://tomoyo.osdn.jp/2.5/policy-specification/index.html .
30+
https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .
3131

3232
Materials we prepared for seminars and symposiums are available at
33-
https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
33+
https://sourceforge.net/projects/tomoyo/files/docs/ .
3434
Below lists are chosen from three aspects.
3535

3636
What is TOMOYO?
3737
TOMOYO Linux Overview
38-
https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf
38+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf
3939
TOMOYO Linux: pragmatic and manageable security for Linux
40-
https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf
40+
https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf
4141
TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box
42-
https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf
42+
https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf
4343

4444
What can TOMOYO do?
4545
Deep inside TOMOYO Linux
46-
https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf
46+
https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf
4747
The role of "pathname based access control" in security.
48-
https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf
48+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf
4949

5050
History of TOMOYO?
5151
Realities of Mainlining
52-
https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf
53-
54-
What is future plan?
55-
====================
56-
57-
We believe that inode based security and name based security are complementary
58-
and both should be used together. But unfortunately, so far, we cannot enable
59-
multiple LSM modules at the same time. We feel sorry that you have to give up
60-
SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
61-
62-
We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
63-
version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .
64-
LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
65-
to port non-LSM version's functionalities to LSM versions.
52+
https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -788,25 +788,6 @@
788788
Documentation/networking/netconsole.rst for an
789789
alternative.
790790

791-
<DEVNAME>:<n>.<n>[,options]
792-
Use the specified serial port on the serial core bus.
793-
The addressing uses DEVNAME of the physical serial port
794-
device, followed by the serial core controller instance,
795-
and the serial port instance. The options are the same
796-
as documented for the ttyS addressing above.
797-
798-
The mapping of the serial ports to the tty instances
799-
can be viewed with:
800-
801-
$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*
802-
/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0
803-
804-
In the above example, the console can be addressed with
805-
console=00:04:0.0. Note that a console addressed this
806-
way will only get added when the related device driver
807-
is ready. The use of an earlycon parameter in addition to
808-
the console may be desired for console output early on.
809-
810791
uart[8250],io,<addr>[,options]
811792
uart[8250],mmio,<addr>[,options]
812793
uart[8250],mmio16,<addr>[,options]
@@ -1921,6 +1902,28 @@
19211902
Format:
19221903
<bus_id>,<clkrate>
19231904

1905+
i2c_touchscreen_props= [HW,ACPI,X86]
1906+
Set device-properties for ACPI-enumerated I2C-attached
1907+
touchscreen, to e.g. fix coordinates of upside-down
1908+
mounted touchscreens. If you need this option please
1909+
submit a drivers/platform/x86/touchscreen_dmi.c patch
1910+
adding a DMI quirk for this.
1911+
1912+
Format:
1913+
<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]
1914+
Where <val> is one of:
1915+
Omit "=<val>" entirely Set a boolean device-property
1916+
Unsigned number Set a u32 device-property
1917+
Anything else Set a string device-property
1918+
1919+
Examples (split over multiple lines):
1920+
i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:
1921+
touchscreen-inverted-y
1922+
1923+
i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:
1924+
touchscreen-size-y=1080:touchscreen-inverted-y:
1925+
firmware-name=gsl1680-vendor-model.fw:silead,home-button
1926+
19241927
i8042.debug [HW] Toggle i8042 debug mode
19251928
i8042.unmask_kbd_data
19261929
[HW] Enable printing of interrupt data from the KBD port
@@ -2170,12 +2173,6 @@
21702173
Format: 0 | 1
21712174
Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.
21722175

2173-
init_mlocked_on_free= [MM] Fill freed userspace memory with zeroes if
2174-
it was mlock'ed and not explicitly munlock'ed
2175-
afterwards.
2176-
Format: 0 | 1
2177-
Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON
2178-
21792176
init_pkru= [X86] Specify the default memory protection keys rights
21802177
register contents for all processes. 0x55555554 by
21812178
default (disallow access to all but pkey 0). Can

‎Documentation/admin-guide/mm/transhuge.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ anon_fault_fallback_charge
467467
instead falls back to using huge pages with lower orders or
468468
small pages even though the allocation was successful.
469469

470-
anon_swpout
470+
swpout
471471
is incremented every time a huge page is swapped out in one
472472
piece without splitting.
473473

474-
anon_swpout_fallback
474+
swpout_fallback
475475
is incremented if a huge page has to be split before swapout.
476476
Usually because failed to allocate some continuous swap space
477477
for the huge page.

‎Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ the extension, or may have deliberately removed it from the listing.
6565
Misaligned accesses
6666
-------------------
6767

68-
Misaligned accesses are supported in userspace, but they may perform poorly.
68+
Misaligned scalar accesses are supported in userspace, but they may perform
69+
poorly. Misaligned vector accesses are only supported if the Zicclsm extension
70+
is supported.

‎Documentation/block/data-integrity.rst

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,11 @@ bio_free() will automatically free the bip.
153153
4.2 Block Device
154154
----------------
155155

156-
Because the format of the protection data is tied to the physical
157-
disk, each block device has been extended with a block integrity
158-
profile (struct blk_integrity). This optional profile is registered
159-
with the block layer using blk_integrity_register().
160-
161-
The profile contains callback functions for generating and verifying
162-
the protection data, as well as getting and setting application tags.
163-
The profile also contains a few constants to aid in completing,
164-
merging and splitting the integrity metadata.
156+
Block devices can set up the integrity information in the integrity
157+
sub-struture of the queue_limits structure.
165158

166159
Layered block devices will need to pick a profile that's appropriate
167-
for all subdevices. blk_integrity_compare() can help with that. DM
160+
for all subdevices. queue_limits_stack_integrity() can help with that. DM
168161
and MD linear, RAID0 and RAID1 are currently supported. RAID4/5/6
169162
will require extra work due to the application tag.
170163

@@ -250,42 +243,6 @@ will require extra work due to the application tag.
250243
integrity upon completion.
251244

252245

253-
5.4 Registering A Block Device As Capable Of Exchanging Integrity Metadata
254-
--------------------------------------------------------------------------
255-
256-
To enable integrity exchange on a block device the gendisk must be
257-
registered as capable:
258-
259-
`int blk_integrity_register(gendisk, blk_integrity);`
260-
261-
The blk_integrity struct is a template and should contain the
262-
following::
263-
264-
static struct blk_integrity my_profile = {
265-
.name = "STANDARDSBODY-TYPE-VARIANT-CSUM",
266-
.generate_fn = my_generate_fn,
267-
.verify_fn = my_verify_fn,
268-
.tuple_size = sizeof(struct my_tuple_size),
269-
.tag_size = <tag bytes per hw sector>,
270-
};
271-
272-
'name' is a text string which will be visible in sysfs. This is
273-
part of the userland API so chose it carefully and never change
274-
it. The format is standards body-type-variant.
275-
E.g. T10-DIF-TYPE1-IP or T13-EPP-0-CRC.
276-
277-
'generate_fn' generates appropriate integrity metadata (for WRITE).
278-
279-
'verify_fn' verifies that the data buffer matches the integrity
280-
metadata.
281-
282-
'tuple_size' must be set to match the size of the integrity
283-
metadata per sector. I.e. 8 for DIF and EPP.
284-
285-
'tag_size' must be set to identify how many bytes of tag space
286-
are available per hardware sector. For DIF this is either 2 or
287-
0 depending on the value of the Control Mode Page ATO bit.
288-
289246
----------------------------------------------------------------------
290247

291248
2007-12-24 Martin K. Petersen <[email protected]>

0 commit comments

Comments
 (0)