Page MenuHomeFreeBSD
Differential D27124

linux(4): Fix loadable modules after r367395
ClosedPublic
Actions

Authored by cem on Nov 6 2020, 5:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jul 5, 8:50 PM
Unknown Object (File)
Wed, Jul 2, 7:57 AM
Unknown Object (File)
Thu, Jun 26, 4:00 AM
Unknown Object (File)
Tue, Jun 24, 10:56 AM
Unknown Object (File)
Tue, Jun 24, 6:07 AM
Unknown Object (File)
Sun, Jun 15, 1:15 PM
Unknown Object (File)
Sun, Jun 15, 12:26 AM
Unknown Object (File)
Mon, Jun 9, 7:11 PM
View All 88 Files
Subscribers
imp

Details

Reviewers
trasz
emaste
Commits
rGa2760a540fbf: linux(4): Fix loadable modules after r367395
rS367433: linux(4): Fix loadable modules after r367395
Summary

Move dtrace SDT definitions into linux_common module code. Also, build
linux_dummy.c into the linux_common kld -- we don't need separate
versions of these stubs for 32- and 64-bit emulation.

PR: 250897
Reported by: several
X-MFC-With: r367395

Test Plan

Tinderbox i386/amd64/arm64 passes.

Loaded GENERIC in my test VM and loaded all three of linux.ko, linux_common.ko,
and linux64.ko without issue. Ran chrome.

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 34674
Build 31741: arc lint + arc unit

Event Timeline

cem requested review of this revision.Nov 6 2020, 5:35 PM
cem created this revision.
Harbormaster completed remote builds in B34669: Diff 79270.Nov 6 2020, 5:35 PM
trasz added a comment.Nov 6 2020, 7:44 PM

I don't quite understand the problem, nor the fix, but if it works - it works :-)

cem updated this revision to Diff 79281.Nov 6 2020, 7:50 PM

Move MI dummy stubs and SDT definition into linux_common.

Harbormaster completed remote builds in B34674: Diff 79281.Nov 6 2020, 7:50 PM
cem added a comment.Nov 6 2020, 7:51 PM

This tinderboxes and both modules load without issue on amd64. I was able to run a 64-bit binary fine.

cem edited the summary of this revision. (Show Details)Nov 6 2020, 7:51 PM
emaste added a comment.Nov 6 2020, 8:50 PM

No objection if it works

emaste added inline comments.Nov 6 2020, 8:51 PM
sys/compat/linux/linux_dummy.c
39

This comment might be confusing without the context of the removed lines - I would rephrase it to say that we use the same stubs for 32- and 64-bit

cem added inline comments.Nov 6 2020, 10:02 PM
sys/compat/linux/linux_dummy.c
39

I've rewritten this comment somewhat better in what I'll commit, but it's still not especially satisfying. Oh well.

This revision was not accepted when it landed; it landed in state Needs Review.Nov 6 2020, 10:05 PM
Closed by commit rS367433: linux(4): Fix loadable modules after r367395 (authored by cem). · Explain Why
This revision was automatically updated to reflect the committed changes.
cem added a commit: rS367433: linux(4): Fix loadable modules after r367395.
Herald added a subscriber: imp. · View Herald TranscriptNov 6 2020, 10:05 PM
dchagin added a commit: rGa2760a540fbf: linux(4): Fix loadable modules after r367395.Jun 10 2021, 9:31 AM

Revision Contents
Changeset List

PathSize
sys/
compat/
linux/
15 lines
10 lines
13 lines
conf/
1 line

Diff 79281

View Options

sys/compat/linux/linux_common.c

Loading...
View Options

sys/compat/linux/linux_dummy.c

Loading...
View Options

sys/compat/linux/linux_misc.c

Loading...
View Options

sys/conf/files.i386

Loading...