Page MenuHomeFreeBSD
Differential D45351

build: Include sys/cdefs.h in our fcntl.h shim
ClosedPublic
Actions

Authored by imp on May 24 2024, 9:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 4 2025, 4:13 PM
Unknown Object (File)
Feb 28 2025, 4:37 PM
Unknown Object (File)
Jan 27 2025, 4:35 PM
Unknown Object (File)
Jan 24 2025, 4:03 AM
Unknown Object (File)
Jan 22 2025, 7:10 PM
Unknown Object (File)
Jan 18 2025, 9:41 PM
Unknown Object (File)
Jan 10 2025, 8:03 PM
Unknown Object (File)
Dec 6 2024, 10:07 AM
View All 35 Files
Subscribers
None

Details

Reviewers
jrtc27
val_packett.cool
Commits
rG4300e053618f: build: Include sys/cdefs.h in our fcntl.h shim
Summary

On Linux with musl, sys/cdefs.h isn't included with fcntl.h, so when we
use BEGIN_DECL and END_DECL in this file, it fails. There's no harm
in unconditionally including sys/cdefs.h here, so do that to avoid
encoding exactly where it is or isn't needed so we don't have to know
too much about the internal state of other libc implementations.

Co-authored-by: Val Packett <val@packett.cool>
Sponsored by: Netflix
Pull Request: https://github.com/freebsd/freebsd-src/pull/1066

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

imp requested review of this revision.May 24 2024, 9:07 PM
imp created this revision.
imp added a parent revision: D45350: cross-tools: Document a rather bizarre looking construct.
Harbormaster completed remote builds in B57905: Diff 139062.May 24 2024, 9:07 PM
imp added a child revision: D45352: cross-build: Include sys/types.h from sys/param.h.May 24 2024, 9:07 PM
val_packett.cool accepted this revision.May 25 2024, 5:05 PM
This revision is now accepted and ready to land.May 25 2024, 5:05 PM
Closed by commit rG4300e053618f: build: Include sys/cdefs.h in our fcntl.h shim (authored by imp). · Explain WhyMay 26 2024, 5:40 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rG4300e053618f: build: Include sys/cdefs.h in our fcntl.h shim.
jrtc27 added inline comments.May 26 2024, 6:10 PM
tools/build/fcntl.h
37

I was slow to get to reviewing these over the weekend, but this feels like it should be in tools/build/cross-build/include/linux/fcntl.h (which does already exist)

imp added inline comments.May 26 2024, 6:13 PM
tools/build/fcntl.h
37

I thought that at first but landed here due to proximity.

What's your thinking on the way you suggest? What makes that a better place?

jrtc27 added inline comments.May 26 2024, 6:29 PM
tools/build/fcntl.h
37

Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter FreeBSD sources / avoid the ugliness spreading too far, and more clearly signposts why they're there (this looks redundant on FreeBSD, so you'd have to consult git to find out). Not such a big deal in this case compared to a lot of the cross-build hacks as it's just a lone include, but I'd like to keep it principled.

37

(I mean, the comment addresses the signposting of course, but having it in a directory that says linux in it makes it somewhat self-documenting :))

imp added inline comments.May 26 2024, 9:23 PM
tools/build/fcntl.h
37

OK. Moved in https://reviews.freebsd.org/D45373

Revision Contents
Changeset List

PathSize
tools/
build/
7 lines

Diff 139119

View Options

tools/build/fcntl.h

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Lines
static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */
static int cpu_quirks; /* Indicate any hardware bugs. */ static int cpu_quirks; /* Indicate any hardware bugs. */
/* Values for sysctl. */ /* Values for sysctl. */
static struct sysctl_ctx_list cpu_sysctl_ctx; static struct sysctl_ctx_list cpu_sysctl_ctx;
static struct sysctl_oid *cpu_sysctl_tree; static struct sysctl_oid *cpu_sysctl_tree;
static int cpu_cx_generic; static int cpu_cx_generic;
static int cpu_cx_lowest_lim; static int cpu_cx_lowest_lim;
static bool cppc_notify;
static struct acpi_cpu_softc **cpu_softc; static struct acpi_cpu_softc **cpu_softc;
ACPI_SERIAL_DECL(cpu, "ACPI CPU"); ACPI_SERIAL_DECL(cpu, "ACPI CPU");
static int acpi_cpu_probe(device_t dev); static int acpi_cpu_probe(device_t dev);
static int acpi_cpu_attach(device_t dev); static int acpi_cpu_attach(device_t dev);
static int acpi_cpu_suspend(device_t dev); static int acpi_cpu_suspend(device_t dev);
static int acpi_cpu_resume(device_t dev); static int acpi_cpu_resume(device_t dev);
▲ Show 20 Lines • Show All 227 Lines • ▼ Show 20 Lines
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
/* /*
* Ask for MWAIT modes if not disabled and interrupts work * Ask for MWAIT modes if not disabled and interrupts work
* reasonable with MWAIT. * reasonable with MWAIT.
*/ */
if (!acpi_disabled("mwait") && cpu_mwait_usable()) if (!acpi_disabled("mwait") && cpu_mwait_usable())
sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE; sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE;
/*
* Work around a lingering SMM bug which leads to freezes when handling
* CPPC notifications. Tell the SMM we will handle any CPPC notifications.
*/
if ((cpu_power_eax & CPUTPM1_HWP_NOTIFICATION) && cppc_notify)
sc->cpu_features |= ACPI_CAP_INTR_CPPC;
#endif #endif
jhbUnsubmitted
Not Done
Inline Actions

I would maybe call the hint cppc_notify with the sense being that "1" enables it and "0" disables notifications (we try to avoid "negative" hints/tunables). You would then just want to set the default value to 1 and change the last test to cppcval != 0. I would also perhaps rename cppcval to cppc_notify as well.

jhb: I would maybe call the hint `cppc_notify` with the sense being that "1" enables it and "0"…
if (devclass_get_drivers(device_get_devclass(dev), &drivers, if (devclass_get_drivers(device_get_devclass(dev), &drivers,
&drv_count) == 0) { &drv_count) == 0) {
for (i = 0; i < drv_count; i++) { for (i = 0; i < drv_count; i++) {
if (ACPI_GET_FEATURES(drivers[i], &features) == 0) if (ACPI_GET_FEATURES(drivers[i], &features) == 0)
sc->cpu_features |= features; sc->cpu_features |= features;
} }
free(drivers, M_TEMP); free(drivers, M_TEMP);
▲ Show 20 Lines • Show All 563 Lines • ▼ Show 20 Lines if ((sc = cpu_softc[i]) != NULL)
acpi_cpu_startup_cx(sc); acpi_cpu_startup_cx(sc);
} }
/* Add a sysctl handler to handle global Cx lowest setting */ /* Add a sysctl handler to handle global Cx lowest setting */
SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree), SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A",
"Global lowest Cx sleep state to use"); "Global lowest Cx sleep state to use");
/* Add sysctl handler to control registering for CPPC notifications */
cppc_notify = 1;
SYSCTL_ADD_BOOL(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cppc_notify", CTLFLAG_RDTUN | CTLFLAG_MPSAFE,
&cppc_notify, 0, "Register for CPPC Notifications");
/* Take over idling from cpu_idle_default(). */ /* Take over idling from cpu_idle_default(). */
cpu_cx_lowest_lim = 0; cpu_cx_lowest_lim = 0;
CPU_FOREACH(i) { CPU_FOREACH(i) {
if ((sc = cpu_softc[i]) != NULL) if ((sc = cpu_softc[i]) != NULL)
enable_idle(sc); enable_idle(sc);
} }
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
▲ Show 20 Lines • Show All 525 Lines • Show Last 20 Lines