Page MenuHomeFreeBSD
Differential D57607

kldload: Fix some regressions in linker_load_module()
AbandonedPublic
Actions

Authored by markj on Tue, Jun 16, 1:51 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Jun 21, 9:58 PM
Unknown Object (File)
Sat, Jun 20, 10:39 PM
Unknown Object (File)
Fri, Jun 19, 4:18 PM
Unknown Object (File)
Fri, Jun 19, 2:33 AM
Unknown Object (File)
Thu, Jun 18, 8:04 PM
Unknown Object (File)
Thu, Jun 18, 8:00 PM
Unknown Object (File)
Thu, Jun 18, 11:21 AM
Unknown Object (File)
Wed, Jun 17, 12:41 AM
Subscribers
olce

Details

Reviewers
emaste
kib
imp
jim.chen.1827_gmail.com
Summary
  • We must not call modlist_lookup() with modname==NULL.
  • Don't assume that an already-loaded KLD will definitely contain a given module.

Fixes: db887713de2b ("kldload: Improve error handling")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 73909
Build 70792: arc lint + arc unit

Event Timeline

markj created this revision.Tue, Jun 16, 1:51 PM
Herald added a subscriber: olce. · View Herald TranscriptTue, Jun 16, 1:51 PM
markj requested review of this revision.Tue, Jun 16, 1:51 PM
Harbormaster completed remote builds in B73909: Diff 179866.Tue, Jun 16, 1:51 PM
markj added a reviewer: jim.chen.1827_gmail.com.Tue, Jun 16, 1:51 PM
emaste added inline comments.Tue, Jun 16, 1:55 PM
sys/kern/kern_linker.c
2323

Probably worth adding braces given the multi-line statements.

markj updated this revision to Diff 179867.Tue, Jun 16, 1:56 PM
markj marked an inline comment as done.

braces

Harbormaster completed remote builds in B73910: Diff 179867.Tue, Jun 16, 1:56 PM
kib accepted this revision.Tue, Jun 16, 2:41 PM
This revision is now accepted and ready to land.Tue, Jun 16, 2:41 PM
emaste accepted this revision.Tue, Jun 16, 2:42 PM
markj abandoned this revision.Tue, Jun 16, 3:05 PM

This patch is still wrong. I have to travel today and don't have much time to debug. I will revert the original commit since it causes the test suite to panic:

root@freebsd:~ # kldload zfs                                                   
panic: Assertion mod != NULL failed at /home/markj/sb/main/src/sys/kern/kern_linker.c:2299                                                                     
cpuid = 4                                                                      
time = 1781621653                                                              
KDB: stack backtrace:                                                          
db_trace_self_wrapper() at db_trace_self_wrapper+0xa5/frame 0xfffffe00f15d6130 
kdb_backtrace() at kdb_backtrace+0xc6/frame 0xfffffe00f15d6290                 
vpanic() at vpanic+0x214/frame 0xfffffe00f15d6430                              
panic() at panic+0xb5/frame 0xfffffe00f15d64f0                                 
linker_load_module() at linker_load_module+0x50f/frame 0xfffffe00f15d6bb0      
kern_kldload() at kern_kldload+0x267/frame 0xfffffe00f15d6c70                  
sys_kldload() at sys_kldload+0xcf/frame 0xfffffe00f15d6d10                                                                                                     
amd64_syscall() at amd64_syscall+0x3d5/frame 0xfffffe00f15d6f30                
fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe00f15d6f30                                                                                     
--- syscall (304, FreeBSD ELF64, kldload), rip = 0x2a7d2a19f20a, rsp = 0x2a7d27c09258, rbp = 0x2a7d27c097d0 ---
KDB: enter: panic                                                              
[ thread pid 4688 tid 100373 ]                                                                                                                                 
Stopped at      kdb_enter+0x34: movq    $0,0x26ae401(%rip)
emaste added a comment.Tue, Jun 16, 3:17 PM

I went ahead and reverted

Revision Contents
Changeset List

PathSize
sys/
kern/
39 lines

Diff 179866

View Options

sys/kern/kern_linker.c

Loading...