Skip to content

Commit b6b4025

Browse files
committed
changes to ci
1 parent 6ee9a19 commit b6b4025

17 files changed

+73
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,11 @@ jobs:
368368
grep '] rust_selftests: All tests passed. Congratulations!$' qemu-stdout.log
369369
grep '] rust_selftests: Rust self tests (exit)$' qemu-stdout.log
370370
371+
- run: |
372+
grep '] rust_debugfs: Rust debugfs sample (init)$' qemu-stdout.log
373+
grep '] rust_debugfs: Rust debugfs sample (exit)$' qemu-stdout.log
374+
grep '^Debugfs file read count: 2$' qemu-stdout.log
375+
371376
# Report
372377
- run: |
373378
cat ${{ env.BUILD_DIR }}.config

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,6 +1782,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
17821782
CONFIG_SAMPLE_RUST_RANDOM=m
17831783
CONFIG_SAMPLE_RUST_HOSTPROGS=y
17841784
CONFIG_SAMPLE_RUST_SELFTESTS=m
1785+
CONFIG_SAMPLE_RUST_DEBUGFS=m
17851786
# CONFIG_STRICT_DEVMEM is not set
17861787

17871788
#

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
17061706
CONFIG_SAMPLE_RUST_RANDOM=m
17071707
CONFIG_SAMPLE_RUST_HOSTPROGS=y
17081708
CONFIG_SAMPLE_RUST_SELFTESTS=m
1709+
CONFIG_SAMPLE_RUST_DEBUGFS=m
17091710
# CONFIG_STRICT_DEVMEM is not set
17101711

17111712
#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10741074
#
10751075
# Pseudo filesystems
10761076
#
1077-
# CONFIG_PROC_FS is not set
1077+
CONFIG_PROC_FS=y
10781078
# CONFIG_PROC_CHILDREN is not set
10791079
# CONFIG_SYSFS is not set
10801080
# CONFIG_HUGETLBFS is not set
@@ -1439,6 +1439,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14391439
CONFIG_SAMPLE_RUST_RANDOM=m
14401440
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14411441
CONFIG_SAMPLE_RUST_SELFTESTS=m
1442+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14421443

14431444
#
14441445
# arm64 Debugging

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10691069
#
10701070
# Pseudo filesystems
10711071
#
1072-
# CONFIG_PROC_FS is not set
1072+
CONFIG_PROC_FS=y
10731073
# CONFIG_PROC_CHILDREN is not set
10741074
# CONFIG_SYSFS is not set
10751075
# CONFIG_HUGETLBFS is not set
@@ -1434,6 +1434,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14341434
CONFIG_SAMPLE_RUST_RANDOM=m
14351435
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14361436
CONFIG_SAMPLE_RUST_SELFTESTS=m
1437+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14371438

14381439
#
14391440
# arm64 Debugging

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10691069
#
10701070
# Pseudo filesystems
10711071
#
1072-
# CONFIG_PROC_FS is not set
1072+
CONFIG_PROC_FS=y
10731073
# CONFIG_PROC_CHILDREN is not set
10741074
# CONFIG_SYSFS is not set
10751075
# CONFIG_HUGETLBFS is not set
@@ -1216,7 +1216,10 @@ CONFIG_FRAME_POINTER=y
12161216
# Generic Kernel Debugging Instruments
12171217
#
12181218
# CONFIG_MAGIC_SYSRQ is not set
1219-
# CONFIG_DEBUG_FS is not set
1219+
CONFIG_DEBUG_FS=y
1220+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1221+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1222+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12201223
CONFIG_HAVE_ARCH_KGDB=y
12211224
# CONFIG_KGDB is not set
12221225
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
@@ -1357,6 +1360,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13571360
CONFIG_SAMPLE_RUST_RANDOM=m
13581361
CONFIG_SAMPLE_RUST_HOSTPROGS=y
13591362
CONFIG_SAMPLE_RUST_SELFTESTS=m
1363+
CONFIG_SAMPLE_RUST_DEBUGFS=m
13601364

13611365
#
13621366
# arm64 Debugging

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10641064
#
10651065
# Pseudo filesystems
10661066
#
1067-
# CONFIG_PROC_FS is not set
1067+
CONFIG_PROC_FS=y
10681068
# CONFIG_PROC_CHILDREN is not set
10691069
# CONFIG_SYSFS is not set
10701070
# CONFIG_HUGETLBFS is not set
@@ -1211,7 +1211,10 @@ CONFIG_FRAME_POINTER=y
12111211
# Generic Kernel Debugging Instruments
12121212
#
12131213
# CONFIG_MAGIC_SYSRQ is not set
1214-
# CONFIG_DEBUG_FS is not set
1214+
CONFIG_DEBUG_FS=y
1215+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1216+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1217+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12151218
CONFIG_HAVE_ARCH_KGDB=y
12161219
# CONFIG_KGDB is not set
12171220
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
@@ -1352,6 +1355,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13521355
CONFIG_SAMPLE_RUST_RANDOM=m
13531356
CONFIG_SAMPLE_RUST_HOSTPROGS=y
13541357
CONFIG_SAMPLE_RUST_SELFTESTS=m
1358+
CONFIG_SAMPLE_RUST_DEBUGFS=m
13551359

13561360
#
13571361
# arm64 Debugging

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,9 +1310,9 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
13101310
CONFIG_MAGIC_SYSRQ_SERIAL=y
13111311
CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
13121312
CONFIG_DEBUG_FS=y
1313-
# CONFIG_DEBUG_FS_ALLOW_ALL is not set
1313+
CONFIG_DEBUG_FS_ALLOW_ALL=y
13141314
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1315-
CONFIG_DEBUG_FS_ALLOW_NONE=y
1315+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
13161316
CONFIG_HAVE_ARCH_KGDB=y
13171317
CONFIG_KGDB=y
13181318
CONFIG_KGDB_HONOUR_BLOCKLIST=y
@@ -1494,6 +1494,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14941494
CONFIG_SAMPLE_RUST_RANDOM=m
14951495
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14961496
CONFIG_SAMPLE_RUST_SELFTESTS=m
1497+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14971498
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14981499
# CONFIG_STRICT_DEVMEM is not set
14991500

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,10 @@ CONFIG_FRAME_WARN=2048
13661366
# Generic Kernel Debugging Instruments
13671367
#
13681368
# CONFIG_MAGIC_SYSRQ is not set
1369-
# CONFIG_DEBUG_FS is not set
1369+
CONFIG_DEBUG_FS=y
1370+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1371+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1372+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
13701373
CONFIG_HAVE_ARCH_KGDB=y
13711374
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
13721375
# CONFIG_UBSAN is not set
@@ -1456,6 +1459,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14561459
CONFIG_SAMPLE_RUST_RANDOM=m
14571460
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14581461
CONFIG_SAMPLE_RUST_SELFTESTS=m
1462+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14591463
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14601464
# CONFIG_STRICT_DEVMEM is not set
14611465

.github/workflows/kernel-riscv64-debug.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,10 @@ CONFIG_FRAME_POINTER=y
11221122
# Generic Kernel Debugging Instruments
11231123
#
11241124
# CONFIG_MAGIC_SYSRQ is not set
1125-
# CONFIG_DEBUG_FS is not set
1125+
CONFIG_DEBUG_FS=y
1126+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1127+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1128+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
11261129
CONFIG_HAVE_ARCH_KGDB=y
11271130
CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=y
11281131
# CONFIG_KGDB is not set
@@ -1288,6 +1291,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
12881291
CONFIG_SAMPLE_RUST_RANDOM=m
12891292
CONFIG_SAMPLE_RUST_HOSTPROGS=y
12901293
CONFIG_SAMPLE_RUST_SELFTESTS=m
1294+
CONFIG_SAMPLE_RUST_DEBUGFS=m
12911295
# CONFIG_STRICT_DEVMEM is not set
12921296

12931297
#

.github/workflows/kernel-riscv64-release.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,10 @@ CONFIG_FRAME_POINTER=y
11101110
# Generic Kernel Debugging Instruments
11111111
#
11121112
# CONFIG_MAGIC_SYSRQ is not set
1113-
# CONFIG_DEBUG_FS is not set
1113+
CONFIG_DEBUG_FS=y
1114+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1115+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1116+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
11141117
CONFIG_HAVE_ARCH_KGDB=y
11151118
CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=y
11161119
# CONFIG_UBSAN is not set
@@ -1204,6 +1207,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
12041207
CONFIG_SAMPLE_RUST_RANDOM=m
12051208
CONFIG_SAMPLE_RUST_HOSTPROGS=y
12061209
CONFIG_SAMPLE_RUST_SELFTESTS=m
1210+
CONFIG_SAMPLE_RUST_DEBUGFS=m
12071211
# CONFIG_STRICT_DEVMEM is not set
12081212

12091213
#

.github/workflows/kernel-x86_64-debug-thinlto.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10641064
#
10651065
# Pseudo filesystems
10661066
#
1067-
# CONFIG_PROC_FS is not set
1067+
CONFIG_PROC_FS=y
10681068
# CONFIG_PROC_CHILDREN is not set
10691069
CONFIG_KERNFS=y
10701070
CONFIG_SYSFS=y
@@ -1222,9 +1222,9 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
12221222
CONFIG_MAGIC_SYSRQ_SERIAL=y
12231223
CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
12241224
CONFIG_DEBUG_FS=y
1225-
# CONFIG_DEBUG_FS_ALLOW_ALL is not set
1225+
CONFIG_DEBUG_FS_ALLOW_ALL=y
12261226
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1227-
CONFIG_DEBUG_FS_ALLOW_NONE=y
1227+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12281228
CONFIG_HAVE_ARCH_KGDB=y
12291229
CONFIG_KGDB=y
12301230
CONFIG_KGDB_HONOUR_BLOCKLIST=y
@@ -1443,6 +1443,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14431443
CONFIG_SAMPLE_RUST_RANDOM=m
14441444
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14451445
CONFIG_SAMPLE_RUST_SELFTESTS=m
1446+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14461447
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14471448
# CONFIG_STRICT_DEVMEM is not set
14481449

.github/workflows/kernel-x86_64-debug.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
10591059
#
10601060
# Pseudo filesystems
10611061
#
1062-
# CONFIG_PROC_FS is not set
1062+
CONFIG_PROC_FS=y
10631063
# CONFIG_PROC_CHILDREN is not set
10641064
CONFIG_KERNFS=y
10651065
CONFIG_SYSFS=y
@@ -1217,9 +1217,9 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
12171217
CONFIG_MAGIC_SYSRQ_SERIAL=y
12181218
CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
12191219
CONFIG_DEBUG_FS=y
1220-
# CONFIG_DEBUG_FS_ALLOW_ALL is not set
1220+
CONFIG_DEBUG_FS_ALLOW_ALL=y
12211221
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1222-
CONFIG_DEBUG_FS_ALLOW_NONE=y
1222+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12231223
CONFIG_HAVE_ARCH_KGDB=y
12241224
CONFIG_KGDB=y
12251225
CONFIG_KGDB_HONOUR_BLOCKLIST=y
@@ -1446,6 +1446,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
14461446
CONFIG_SAMPLE_RUST_RANDOM=m
14471447
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14481448
CONFIG_SAMPLE_RUST_SELFTESTS=m
1449+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14491450
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14501451
# CONFIG_STRICT_DEVMEM is not set
14511452

.github/workflows/kernel-x86_64-release-thinlto.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,10 @@ CONFIG_STACK_VALIDATION=y
12891289
# Generic Kernel Debugging Instruments
12901290
#
12911291
# CONFIG_MAGIC_SYSRQ is not set
1292-
# CONFIG_DEBUG_FS is not set
1292+
CONFIG_DEBUG_FS=y
1293+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1294+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1295+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12931296
CONFIG_HAVE_ARCH_KGDB=y
12941297
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
12951298
# CONFIG_UBSAN is not set
@@ -1399,6 +1402,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13991402
CONFIG_SAMPLE_RUST_RANDOM=m
14001403
CONFIG_SAMPLE_RUST_HOSTPROGS=y
14011404
CONFIG_SAMPLE_RUST_SELFTESTS=m
1405+
CONFIG_SAMPLE_RUST_DEBUGFS=m
14021406
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
14031407
# CONFIG_STRICT_DEVMEM is not set
14041408

.github/workflows/kernel-x86_64-release.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,10 @@ CONFIG_STACK_VALIDATION=y
12841284
# Generic Kernel Debugging Instruments
12851285
#
12861286
# CONFIG_MAGIC_SYSRQ is not set
1287-
# CONFIG_DEBUG_FS is not set
1287+
CONFIG_DEBUG_FS=y
1288+
CONFIG_DEBUG_FS_ALLOW_ALL=y
1289+
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
1290+
# CONFIG_DEBUG_FS_ALLOW_NONE is not set
12881291
CONFIG_HAVE_ARCH_KGDB=y
12891292
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
12901293
# CONFIG_UBSAN is not set
@@ -1394,6 +1397,7 @@ CONFIG_SAMPLE_RUST_SEMAPHORE_C=m
13941397
CONFIG_SAMPLE_RUST_RANDOM=m
13951398
CONFIG_SAMPLE_RUST_HOSTPROGS=y
13961399
CONFIG_SAMPLE_RUST_SELFTESTS=m
1400+
CONFIG_SAMPLE_RUST_DEBUGFS=m
13971401
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
13981402
# CONFIG_STRICT_DEVMEM is not set
13991403

.github/workflows/qemu-init.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,17 @@ busybox insmod rust_module_parameters_loadable_custom.ko \
4040
busybox rmmod rust_module_parameters_loadable_default.ko
4141
busybox rmmod rust_module_parameters_loadable_custom.ko
4242

43+
busybox insmod rust_debugfs.ko
44+
busybox mkdir proc
45+
busybox mount -t proc proc /proc
46+
busybox mkdir debugfs
47+
busybox mount -t debugfs debugfs /debugfs
48+
export RUST_SEQ_MINOR=$(busybox cat /proc/misc | busybox grep rust_debugfs | busybox cut -d ' ' -f 1)
49+
busybox mknod /dev/rust_debugfs0 c 10 $RUST_SEQ_MINOR
50+
busybox cat /dev/rust_debugfs0
51+
busybox cat /dev/rust_debugfs0
52+
busybox cat /debugfs/rust_debugfs_debug/rust_debugfs
53+
busybox rm /dev/rust_debugfs0
54+
busybox rmmod rust_debugfs.ko
55+
4356
busybox reboot -f

.github/workflows/qemu-initramfs.desc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ file /rust_stack_probing.ko samples/rust/rust_stack_probing.ko 0755
1515
file /rust_semaphore.ko samples/rust/rust_semaphore.ko 0755 0 0
1616
file /rust_semaphore_c.ko samples/rust/rust_semaphore_c.ko 0755 0 0
1717
file /rust_selftests.ko samples/rust/rust_selftests.ko 0755 0 0
18+
file /rust_debugfs.ko samples/rust/rust_debugfs.ko 0755 0 0
1819

1920
file /rust_module_parameters_loadable_default.ko samples/rust/rust_module_parameters_loadable_default.ko 0755 0 0
2021
file /rust_module_parameters_loadable_custom.ko samples/rust/rust_module_parameters_loadable_custom.ko 0755 0 0

0 commit comments

Comments
 (0)