Skip to content

Commit e55cbe3

Browse files
wedsonafwedsonaf
authored
Merge branch 'rust' into file_flags_type
2 parents 5a83d71 + 1781c4c commit e55cbe3

22,722 files changed

Lines changed: 2162185 additions & 607451 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.

‎.clang-format‎

Lines changed: 170 additions & 48 deletions
Large diffs are not rendered by default.

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
ci:
99
runs-on: ubuntu-20.04
10-
container: ghcr.io/rust-for-linux/ci
10+
container: ghcr.io/rust-for-linux/ci:Rust-1.62.0
1111
timeout-minutes: 20
1212

1313
strategy:
@@ -266,6 +266,9 @@ jobs:
266266
! grep -v 'at mm/debug_vm_pgtable.c:' qemu-stdout.log | grep '] WARNING:'
267267
268268
# Check
269+
- run: |
270+
grep '] ok 1 - rust_kernel_doctests$' qemu-stdout.log
271+
269272
- run: |
270273
grep '] rust_minimal: Rust minimal sample (init)$' qemu-stdout.log
271274
grep '] rust_minimal: Am I built-in? false$' qemu-stdout.log
@@ -360,6 +363,11 @@ jobs:
360363
grep '] rust_semaphore_c: Rust semaphore sample (in C, for comparison) (init)$' qemu-stdout.log
361364
grep '] rust_semaphore_c: Rust semaphore sample (in C, for comparison) (exit)$' qemu-stdout.log
362365
366+
- run: |
367+
grep '] rust_selftests: Rust self tests (init)$' qemu-stdout.log
368+
grep '] rust_selftests: All tests passed. Congratulations!$' qemu-stdout.log
369+
grep '] rust_selftests: Rust self tests (exit)$' qemu-stdout.log
370+
363371
# Report
364372
- run: |
365373
cat ${{ env.BUILD_DIR }}.config
@@ -405,5 +413,8 @@ jobs:
405413
grep -F '.text' ${{ env.BUILD_DIR }}samples/rust/rust_minimal.s
406414
grep -F '; ModuleID' ${{ env.BUILD_DIR }}samples/rust/rust_minimal.ll
407415
416+
# Rust host programs
417+
- run: ${{ env.BUILD_DIR }}samples/rust/hostprogs/single | grep -F 'The number is 42.'
418+
408419
# View changes to ccache
409420
- run: ccache -s

‎.github/workflows/kernel-arm-debug.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1780,6 +1780,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
17801780
CONFIG_SAMPLE_RUST_SEMAPHORE=m
17811781
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
17821782
CONFIG_SAMPLE_RUST_RANDOM=m
1783+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1784+
CONFIG_SAMPLE_RUST_SELFTESTS=m
17831785
# CONFIG_STRICT_DEVMEM is not set
17841786

17851787
#
@@ -1801,7 +1803,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
18011803
#
18021804
# Kernel Testing and Coverage
18031805
#
1804-
# CONFIG_KUNIT is not set
1806+
CONFIG_KUNIT=y
18051807
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
18061808
# CONFIG_FAULT_INJECTION is not set
18071809
CONFIG_ARCH_HAS_KCOV=y
@@ -1826,6 +1828,7 @@ CONFIG_RUST_OPT_LEVEL_2=y
18261828
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
18271829
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
18281830
CONFIG_RUST_BUILD_ASSERT_DENY=y
1831+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
18291832
# end of Rust hacking
18301833
# end of Kernel hacking
18311834

‎.github/workflows/kernel-arm-release.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
17041704
CONFIG_SAMPLE_RUST_SEMAPHORE=m
17051705
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
17061706
CONFIG_SAMPLE_RUST_RANDOM=m
1707+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1708+
CONFIG_SAMPLE_RUST_SELFTESTS=m
17071709
# CONFIG_STRICT_DEVMEM is not set
17081710

17091711
#
@@ -1724,7 +1726,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
17241726
#
17251727
# Kernel Testing and Coverage
17261728
#
1727-
# CONFIG_KUNIT is not set
1729+
CONFIG_KUNIT=y
17281730
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
17291731
# CONFIG_FAULT_INJECTION is not set
17301732
CONFIG_ARCH_HAS_KCOV=y
@@ -1784,7 +1786,8 @@ CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C=y
17841786
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
17851787
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
17861788
CONFIG_RUST_BUILD_ASSERT_DENY=y
1789+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
17871790
# end of Rust hacking
17881791
# end of Kernel hacking
17891792

1790-
CONFIG_WERROR=y
1793+
CONFIG_WERROR=y

‎.github/workflows/kernel-arm64-debug-thinlto.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
14371437
CONFIG_SAMPLE_RUST_SEMAPHORE=m
14381438
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14391439
CONFIG_SAMPLE_RUST_RANDOM=m
1440+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1441+
CONFIG_SAMPLE_RUST_SELFTESTS=m
14401442

14411443
#
14421444
# arm64 Debugging
@@ -1449,7 +1451,7 @@ CONFIG_PID_IN_CONTEXTIDR=y
14491451
#
14501452
# Kernel Testing and Coverage
14511453
#
1452-
# CONFIG_KUNIT is not set
1454+
CONFIG_KUNIT=y
14531455
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
14541456
CONFIG_FUNCTION_ERROR_INJECTION=y
14551457
# CONFIG_FAULT_INJECTION is not set
@@ -1475,6 +1477,7 @@ CONFIG_RUST_OPT_LEVEL_1=y
14751477
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
14761478
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
14771479
CONFIG_RUST_BUILD_ASSERT_DENY=y
1480+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
14781481
# end of Rust hacking
14791482
# end of Kernel hacking
14801483

‎.github/workflows/kernel-arm64-debug.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
14321432
CONFIG_SAMPLE_RUST_SEMAPHORE=m
14331433
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14341434
CONFIG_SAMPLE_RUST_RANDOM=m
1435+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1436+
CONFIG_SAMPLE_RUST_SELFTESTS=m
14351437

14361438
#
14371439
# arm64 Debugging
@@ -1444,7 +1446,7 @@ CONFIG_PID_IN_CONTEXTIDR=y
14441446
#
14451447
# Kernel Testing and Coverage
14461448
#
1447-
# CONFIG_KUNIT is not set
1449+
CONFIG_KUNIT=y
14481450
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
14491451
CONFIG_FUNCTION_ERROR_INJECTION=y
14501452
# CONFIG_FAULT_INJECTION is not set
@@ -1470,6 +1472,7 @@ CONFIG_RUST_OPT_LEVEL_1=y
14701472
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
14711473
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
14721474
CONFIG_RUST_BUILD_ASSERT_DENY=y
1475+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
14731476
# end of Rust hacking
14741477
# end of Kernel hacking
14751478

‎.github/workflows/kernel-arm64-release-thinlto.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
13551355
CONFIG_SAMPLE_RUST_SEMAPHORE=m
13561356
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13571357
CONFIG_SAMPLE_RUST_RANDOM=m
1358+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1359+
CONFIG_SAMPLE_RUST_SELFTESTS=m
13581360

13591361
#
13601362
# arm64 Debugging
@@ -1367,7 +1369,7 @@ CONFIG_SAMPLE_RUST_RANDOM=m
13671369
#
13681370
# Kernel Testing and Coverage
13691371
#
1370-
# CONFIG_KUNIT is not set
1372+
CONFIG_KUNIT=y
13711373
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
13721374
# CONFIG_FAULT_INJECTION is not set
13731375
CONFIG_ARCH_HAS_KCOV=y
@@ -1392,7 +1394,8 @@ CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C=y
13921394
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
13931395
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
13941396
CONFIG_RUST_BUILD_ASSERT_DENY=y
1397+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
13951398
# end of Rust hacking
13961399
# end of Kernel hacking
13971400

1398-
CONFIG_WERROR=y
1401+
CONFIG_WERROR=y

‎.github/workflows/kernel-arm64-release.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,6 +1350,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
13501350
CONFIG_SAMPLE_RUST_SEMAPHORE=m
13511351
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13521352
CONFIG_SAMPLE_RUST_RANDOM=m
1353+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1354+
CONFIG_SAMPLE_RUST_SELFTESTS=m
13531355

13541356
#
13551357
# arm64 Debugging
@@ -1362,7 +1364,7 @@ CONFIG_SAMPLE_RUST_RANDOM=m
13621364
#
13631365
# Kernel Testing and Coverage
13641366
#
1365-
# CONFIG_KUNIT is not set
1367+
CONFIG_KUNIT=y
13661368
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
13671369
# CONFIG_FAULT_INJECTION is not set
13681370
CONFIG_ARCH_HAS_KCOV=y
@@ -1387,7 +1389,8 @@ CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C=y
13871389
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
13881390
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
13891391
CONFIG_RUST_BUILD_ASSERT_DENY=y
1392+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
13901393
# end of Rust hacking
13911394
# end of Kernel hacking
13921395

1393-
CONFIG_WERROR=y
1396+
CONFIG_WERROR=y

‎.github/workflows/kernel-ppc64le-debug.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ CONFIG_NO_HZ_COMMON=y
7171
CONFIG_NO_HZ_IDLE=y
7272
# CONFIG_NO_HZ_FULL is not set
7373
# CONFIG_NO_HZ is not set
74-
# CONFIG_HIGH_RES_TIMERS is not set
74+
CONFIG_HIGH_RES_TIMERS=y
7575
# end of Timers subsystem
7676

7777
# CONFIG_PREEMPT_NONE is not set
@@ -1492,6 +1492,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
14921492
CONFIG_SAMPLE_RUST_SEMAPHORE=m
14931493
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14941494
CONFIG_SAMPLE_RUST_RANDOM=m
1495+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1496+
CONFIG_SAMPLE_RUST_SELFTESTS=m
14951497
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14961498
# CONFIG_STRICT_DEVMEM is not set
14971499

@@ -1591,6 +1593,7 @@ CONFIG_RUST_OPT_LEVEL_0=y
15911593
# CONFIG_RUST_OPT_LEVEL_Z is not set
15921594
CONFIG_RUST_BUILD_ASSERT_ALLOW=y
15931595
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
1596+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
15941597
# end of Rust hacking
15951598
# end of Kernel hacking
15961599

‎.github/workflows/kernel-ppc64le-release.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ CONFIG_NO_HZ_COMMON=y
7171
CONFIG_NO_HZ_IDLE=y
7272
# CONFIG_NO_HZ_FULL is not set
7373
# CONFIG_NO_HZ is not set
74-
# CONFIG_HIGH_RES_TIMERS is not set
74+
CONFIG_HIGH_RES_TIMERS=y
7575
# end of Timers subsystem
7676

7777
# CONFIG_PREEMPT_NONE is not set
@@ -1454,6 +1454,8 @@ CONFIG_SAMPLE_RUST_STACK_PROBING=m
14541454
CONFIG_SAMPLE_RUST_SEMAPHORE=m
14551455
CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14561456
CONFIG_SAMPLE_RUST_RANDOM=m
1457+
CONFIG_SAMPLE_RUST_HOSTPROGS=y
1458+
CONFIG_SAMPLE_RUST_SELFTESTS=m
14571459
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14581460
# CONFIG_STRICT_DEVMEM is not set
14591461

@@ -1472,7 +1474,7 @@ CONFIG_PRINT_STACK_DEPTH=64
14721474
#
14731475
# Kernel Testing and Coverage
14741476
#
1475-
# CONFIG_KUNIT is not set
1477+
CONFIG_KUNIT=y
14761478
CONFIG_ARCH_HAS_KCOV=y
14771479
CONFIG_CC_HAS_SANCOV_TRACE_PC=y
14781480
# CONFIG_KCOV is not set
@@ -1495,7 +1497,8 @@ CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C=y
14951497
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
14961498
# CONFIG_RUST_BUILD_ASSERT_WARN is not set
14971499
CONFIG_RUST_BUILD_ASSERT_DENY=y
1500+
CONFIG_RUST_KERNEL_KUNIT_TEST=y
14981501
# end of Rust hacking
14991502
# end of Kernel hacking
15001503

1501-
CONFIG_WERROR=y
1504+
CONFIG_WERROR=y

0 commit comments

Comments
 (0)