Page MenuHomeFreeBSD
Differential D25557

linprocfs and linsysfs fixes for biology/linux-foldingathome
ClosedPublic
Actions

Authored by trasz on Jul 3 2020, 8:12 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 4:43 AM
Unknown Object (File)
Mon, Apr 7, 4:42 AM
Unknown Object (File)
Fri, Mar 28, 5:08 PM
Unknown Object (File)
Fri, Mar 14, 3:23 PM
Unknown Object (File)
Mar 13 2025, 3:20 AM
Unknown Object (File)
Mar 8 2025, 8:29 AM
Unknown Object (File)
Jan 24 2025, 7:24 PM
Unknown Object (File)
Jan 18 2025, 1:59 AM
View All 47 Files
Subscribers
imp

Details

Reviewers
None
Commits
rS362929: Make linprocfs(5) create /proc/bus/pci/devices/, and linsysfs(5)
Summary

Make linprocfs(5) create /proc/bus/pci/devices/, and linsysfs(5)
create /sys/class/power_supply/. This silences some warnings
from biology/linux-foldingathome.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

trasz created this revision.Jul 3 2020, 8:12 PM
Herald added a subscriber: imp. · View Herald TranscriptJul 3 2020, 8:12 PM
trasz requested review of this revision.Jul 3 2020, 8:12 PM
Harbormaster completed remote builds in B32126: Diff 74057.Jul 3 2020, 8:12 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jul 4 2020, 11:23 AM
Closed by commit rS362929: Make linprocfs(5) create /proc/bus/pci/devices/, and linsysfs(5) (authored by trasz). · Explain Why
This revision was automatically updated to reflect the committed changes.
trasz added a commit: rS362929: Make linprocfs(5) create /proc/bus/pci/devices/, and linsysfs(5).

Revision Contents
Changeset List

PathSize
head/
sys/
compat/
linprocfs/
5 lines
linsysfs/
2 lines

Diff 74068

View Options

head/sys/compat/linprocfs/linprocfs.c

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines
void void
exec_sysvec_init(void *param) exec_sysvec_init(void *param)
{ {
struct sysentvec *sv; struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX #ifdef RANDOM_FENESTRASX
ptrdiff_t base; ptrdiff_t base;
#endif #endif
u_int flags;
sv = (struct sysentvec *)param; sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0) flags = sv->sv_flags;
if ((flags & SV_SHP) == 0)
kibUnsubmitted
Not Done
Inline Actions

I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.

kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return; return;
MPASS(sv->sv_shared_page_obj == NULL);
MPASS(sv->sv_shared_page_base != 0);
sv->sv_shared_page_obj = shared_page_obj; sv->sv_shared_page_obj = shared_page_obj;
if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base + sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode); shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD) }
return; if ((flags & SV_TIMEKEEP) != 0) {
kibUnsubmitted
Not Done
Inline Actions

Add {} around then statement, it is multi-line.

kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) { if ((flags & SV_ILP32) != 0) {
if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL, KASSERT(compat32_svtk == NULL,
("Compat32 already registered")); ("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32(); compat32_svtk = alloc_sv_tk_compat32();
} else {
KASSERT(compat32_svtk != NULL,
("Compat32 not registered"));
}
kibUnsubmitted
Not Done
Inline Actions

Why do you need to check this condition? The assert on the previous line verified that the condition is true.

kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base + sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off; compat32_svtk->sv_timekeep_off;
} else { } else {
#endif #endif
KASSERT(host_svtk == NULL, ("Host already registered")); if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(host_svtk == NULL,
("Host already registered"));
host_svtk = alloc_sv_tk(); host_svtk = alloc_sv_tk();
} else {
KASSERT(host_svtk != NULL,
("Host not registered"));
}
sv->sv_timekeep_base = sv->sv_shared_page_base + sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off; host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
} }
#endif #endif
} }
#ifdef RANDOM_FENESTRASX #ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) { if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
(flags & SV_RNG_SEED_VER) != 0) {
kibUnsubmitted
Not Done
Inline Actions

This one should be conditional on ABI_FREEBSD as well, perhaps?

kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
kibUnsubmitted
Not Done
Inline Actions

This can be written as a single check

((flags  & (SV_ABI_MASK | SV_RNG_SEED_VER) ) ==  (SV_ABI_FREEBSD | SV_RNG_SEED_VER))

but it is up to you.

kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK | SV_RNG_SEED_VER) ) ==…
/* /*
* Only allocate a single VDSO entry for multiple sysentvecs, * Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32. * i.e., native and COMPAT32.
*/ */
if (fxrng_shpage_mapping == NULL) if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation(); alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping; base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base; sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Linesexec_sysvec_init_secondary(struct sysentvec *sv, struct sysentvec *sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) { if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base + sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base); (sv->sv_timekeep_base - sv->sv_shared_page_base);
} }
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) { if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base + sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base); (sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
} }
} }
kibUnsubmitted
Not Done
Inline Actions

Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state.

kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
kibUnsubmitted
Not Done
Inline Actions

Should sv->sv_shared_page_obj == 0 (NULL BTW?) and sv->sv_shared_page_base != 0 asserts moved to exec_sysvec_init() ?

kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…
View Options

head/sys/compat/linsysfs/linsysfs.c

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines
void void
exec_sysvec_init(void *param) exec_sysvec_init(void *param)
{ {
struct sysentvec *sv; struct sysentvec *sv;
#ifdef RANDOM_FENESTRASX #ifdef RANDOM_FENESTRASX
ptrdiff_t base; ptrdiff_t base;
#endif #endif
u_int flags;
sv = (struct sysentvec *)param; sv = (struct sysentvec *)param;
if ((sv->sv_flags & SV_SHP) == 0) flags = sv->sv_flags;
if ((flags & SV_SHP) == 0)
kibUnsubmitted
Not Done
Inline Actions

I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.

kib: I think that this assert (sv_shared_page_base != 0) should be only done if SV_SHP flag is set.
return; return;
MPASS(sv->sv_shared_page_obj == NULL);
MPASS(sv->sv_shared_page_base != 0);
sv->sv_shared_page_obj = shared_page_obj; sv->sv_shared_page_obj = shared_page_obj;
if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
sv->sv_sigcode_base = sv->sv_shared_page_base + sv->sv_sigcode_base = sv->sv_shared_page_base +
shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode); shared_page_fill(*(sv->sv_szsigcode), 16, sv->sv_sigcode);
if ((sv->sv_flags & SV_ABI_MASK) != SV_ABI_FREEBSD) }
return; if ((flags & SV_TIMEKEEP) != 0) {
kibUnsubmitted
Not Done
Inline Actions

Add {} around then statement, it is multi-line.

kib: Add {} around then statement, it is multi-line.
if ((sv->sv_flags & SV_TIMEKEEP) != 0) {
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
if ((sv->sv_flags & SV_ILP32) != 0) { if ((flags & SV_ILP32) != 0) {
if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(compat32_svtk == NULL, KASSERT(compat32_svtk == NULL,
("Compat32 already registered")); ("Compat32 already registered"));
compat32_svtk = alloc_sv_tk_compat32(); compat32_svtk = alloc_sv_tk_compat32();
} else {
KASSERT(compat32_svtk != NULL,
("Compat32 not registered"));
}
kibUnsubmitted
Not Done
Inline Actions

Why do you need to check this condition? The assert on the previous line verified that the condition is true.

kib: Why do you need to check this condition? The assert on the previous line verified that the…
sv->sv_timekeep_base = sv->sv_shared_page_base + sv->sv_timekeep_base = sv->sv_shared_page_base +
compat32_svtk->sv_timekeep_off; compat32_svtk->sv_timekeep_off;
} else { } else {
#endif #endif
KASSERT(host_svtk == NULL, ("Host already registered")); if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD) {
KASSERT(host_svtk == NULL,
("Host already registered"));
host_svtk = alloc_sv_tk(); host_svtk = alloc_sv_tk();
} else {
KASSERT(host_svtk != NULL,
("Host not registered"));
}
sv->sv_timekeep_base = sv->sv_shared_page_base + sv->sv_timekeep_base = sv->sv_shared_page_base +
host_svtk->sv_timekeep_off; host_svtk->sv_timekeep_off;
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
} }
#endif #endif
} }
#ifdef RANDOM_FENESTRASX #ifdef RANDOM_FENESTRASX
if ((sv->sv_flags & SV_RNG_SEED_VER) != 0) { if ((flags & SV_ABI_MASK) == SV_ABI_FREEBSD &&
(flags & SV_RNG_SEED_VER) != 0) {
kibUnsubmitted
Not Done
Inline Actions

This one should be conditional on ABI_FREEBSD as well, perhaps?

kib: This one should be conditional on ABI_FREEBSD as well, perhaps?
kibUnsubmitted
Not Done
Inline Actions

This can be written as a single check

((flags  & (SV_ABI_MASK | SV_RNG_SEED_VER) ) ==  (SV_ABI_FREEBSD | SV_RNG_SEED_VER))

but it is up to you.

kib: This can be written as a single check ``` ((flags & (SV_ABI_MASK | SV_RNG_SEED_VER) ) ==…
/* /*
* Only allocate a single VDSO entry for multiple sysentvecs, * Only allocate a single VDSO entry for multiple sysentvecs,
* i.e., native and COMPAT32. * i.e., native and COMPAT32.
*/ */
if (fxrng_shpage_mapping == NULL) if (fxrng_shpage_mapping == NULL)
alloc_sv_fxrng_generation(); alloc_sv_fxrng_generation();
base = (char *)fxrng_shpage_mapping - shared_page_mapping; base = (char *)fxrng_shpage_mapping - shared_page_mapping;
sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base; sv->sv_fxrng_gen_base = sv->sv_shared_page_base + base;
Show All 18 Linesexec_sysvec_init_secondary(struct sysentvec *sv, struct sysentvec *sv2)
if ((sv2->sv_flags & SV_TIMEKEEP) != 0) { if ((sv2->sv_flags & SV_TIMEKEEP) != 0) {
sv2->sv_timekeep_base = sv2->sv_shared_page_base + sv2->sv_timekeep_base = sv2->sv_shared_page_base +
(sv->sv_timekeep_base - sv->sv_shared_page_base); (sv->sv_timekeep_base - sv->sv_shared_page_base);
} }
if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) { if ((sv2->sv_flags & SV_RNG_SEED_VER) != 0) {
sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base + sv2->sv_fxrng_gen_base = sv2->sv_shared_page_base +
(sv->sv_fxrng_gen_base - sv->sv_shared_page_base); (sv->sv_fxrng_gen_base - sv->sv_shared_page_base);
} }
} }
kibUnsubmitted
Not Done
Inline Actions

Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()? It only asserts some state.

kib: Now, with the changes to exec_sysvec_init(), what is the reason to have exec_sysvec_init_abi()?
kibUnsubmitted
Not Done
Inline Actions

Should sv->sv_shared_page_obj == 0 (NULL BTW?) and sv->sv_shared_page_base != 0 asserts moved to exec_sysvec_init() ?

kib: Should `sv->sv_shared_page_obj == 0` (NULL BTW?) and `sv->sv_shared_page_base != 0` asserts…