Page MenuHomeFreeBSD
Differential D57465

LinuxKPI: Create `linux/util_macros.h`
AcceptedPublic
Actions

Authored by siri_racha.ca on Jun 5 2026, 7:39 AM.
Tags
Referenced Files
F170788539: D57465.id179812.diff
Sun, Sep 6, 3:32 PM
F170759263: D57465.id181868.diff
Sun, Sep 6, 11:18 AM
F170751293: D57465.id179260.diff
Sun, Sep 6, 10:09 AM
F170691600: D57465.id179769.diff
Sun, Sep 6, 1:29 AM
Unknown Object (File)
Sat, Sep 5, 4:52 PM
Unknown Object (File)
Sat, Sep 5, 1:40 PM
Unknown Object (File)
Sat, Sep 5, 1:24 PM
Unknown Object (File)
Sat, Sep 5, 1:20 PM
View All Files
Subscribers
adrian
bz
dumbbell
emaste
imp
seuros
ziaee

Details

Reviewers
emaste
dumbbell
bz
seuros
adrian
Group Reviewers
linuxkpi
Summary

Newer amdgpu code starts using the for_each_if() macro, defined in
linux/util_macros.h. It is used by amdgpu in Linux 6.12 and later.

Add the macro to LinuxKPI, guarded by LINUXKPI_VERSION so it is only
available to drivers based on Linux versions that provide it.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

siri_racha.ca created this revision.Jun 5 2026, 7:39 AM
Herald added subscribers: linuxkpi, emaste. · View Herald TranscriptJun 5 2026, 7:39 AM
siri_racha.ca requested review of this revision.Jun 5 2026, 7:39 AM
siri_racha.ca updated this revision to Diff 179264.
siri_racha.ca edited the summary of this revision. (Show Details)Jun 5 2026, 7:41 AM
siri_racha.ca added a reviewer: linuxkpi.Jun 5 2026, 9:27 AM
siri_racha.ca removed a subscriber: linuxkpi.
emaste accepted this revision.Jun 5 2026, 1:41 PM
This revision is now accepted and ready to land.Jun 5 2026, 1:41 PM
dumbbell requested changes to this revision.EditedJun 14 2026, 8:22 AM
dumbbell added a subscriber: dumbbell.

for_each_if() already exists in the DRM drivers. It was moved to <linux/util_macros.h> in Linux 6.15 (https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b2108fc82a0acda34388bff3e3ee3544013b1623). Therefore it will need to be wrapped with:

#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 61500
#define for_each_if...
#endif

This is to avoid the risk of double definitions when used with DRM drivers from versions before 6.15.

sys/compat/linuxkpi/common/include/linux/pm.h
35 ↗(On Diff #179264)

Linux doesn’t do that, even on e.g. 7.0.

When the macro was moved to <linux/util_macros.h>, <drm/drm_util.h> started to include it directly. There should be no need for this include.

This revision now requires changes to proceed.Jun 14 2026, 8:22 AM
siri_racha.ca added inline comments.Jun 14 2026, 11:30 PM
sys/compat/linuxkpi/common/include/linux/pm.h
35 ↗(On Diff #179264)

Oh, I see. I originally made the patch the header wasn't there yet. I'm looking at Linux 6.18.4, and it seems to still include it here. Should I remove the include?

siri_racha.ca updated this revision to Diff 179769.Jun 14 2026, 11:31 PM

Now guarded so it is only used if LinuxKPI version is abov 61500

Herald added a subscriber: imp. · View Herald TranscriptJun 14 2026, 11:31 PM
siri_racha.ca updated this revision to Diff 179770.Jun 14 2026, 11:33 PM

Previous diff was incorrect

siri_racha.ca retitled this revision from LinuxKPI: Create linux/util_macros.h, and add it to linux/pm.h to satisify transitivie include in new amdgpu patches to LinuxKPI: Create `linux/util_macros.h`.Jun 14 2026, 11:35 PM
siri_racha.ca edited the summary of this revision. (Show Details)
siri_racha.ca updated this revision to Diff 179775.Jun 15 2026, 7:46 AM
dumbbell requested changes to this revision.Jun 15 2026, 7:50 AM
dumbbell added inline comments.
sys/compat/linuxkpi/common/include/linux/util_macros.h
35

I believe the second part has reversed logic: for_each_if() should be defined here if LINUXKPI_VERSION >= 61500. Before that, it is defined in <drm/drm_util.h>.

The first part is fine.

This revision now requires changes to proceed.Jun 15 2026, 7:50 AM
siri_racha.ca updated this revision to Diff 179812.Jun 15 2026, 5:58 PM
siri_racha.ca marked an inline comment as done.Jun 16 2026, 8:06 PM
siri_racha.ca added inline comments.
sys/compat/linuxkpi/common/include/linux/util_macros.h
35

Should be fixed

siri_racha.ca marked an inline comment as done.Jun 26 2026, 9:12 AM

Just bumping

dumbbell accepted this revision.Jul 11 2026, 8:24 AM
This revision is now accepted and ready to land.Jul 11 2026, 8:24 AM
bz added a subscriber: bz.Jul 11 2026, 3:39 PM
bz added inline comments.
sys/compat/linuxkpi/common/include/linux/util_macros.h
2
  • no longer needed
3

I cannot remember what @imp said last time if this according to style goes below or if this was to be relaxed again?

10

Do we need the full copy of the license given we have the SPDX?

35

If this is used by drm-kmod 6.12 already why do we only enable it for >= 6.15? Ah I see @dumbbell 's comment. Please make sure the commit message gets adjusted before push!

siri_racha.ca added inline comments.Jul 12 2026, 11:11 PM
sys/compat/linuxkpi/common/include/linux/util_macros.h
3

Had a look at style(9) and it says to just do Copyright + "SPDX-License-Identifier: BSD-2-Clause", I'll remove the rest in a bit, I kinda just copied it from another file

35

Will update in next revision, thanks for the catch!!

siri_racha.ca updated this revision to Diff 181868.Jul 13 2026, 1:14 AM
This revision now requires review to proceed.Jul 13 2026, 1:14 AM
bz accepted this revision.Jul 13 2026, 7:58 AM
This revision is now accepted and ready to land.Jul 13 2026, 7:58 AM
bz added inline comments.Jul 13 2026, 7:59 AM
sys/compat/linuxkpi/common/include/linux/util_macros.h
2

While it is still true that the *-* is no longer needed, you can just remove it before committing or leaving it.

bz mentioned this in D58254: linuxkpi: Define `for_each_if()`.Jul 15 2026, 11:03 AM
emaste added a project: linuxkpi.Mon, Aug 17, 5:01 PM
siri_racha.ca added a child revision: D58845: LinuxKPI: Add cpufreq_quick_get_max to LinuxKPI for amdkfd support.Tue, Aug 25, 7:02 PM
seuros requested changes to this revision.Thu, Sep 3, 1:50 PM
seuros added subscribers: ziaee, seuros.

This need @ziaee's review , the util_macros.h header is not style(9) compliant.

This revision now requires changes to proceed.Thu, Sep 3, 1:50 PM
bz added a comment.Thu, Sep 3, 2:40 PM
In D57465#1361593, @seuros wrote:

This need @ziaee's review , the util_macros.h header is not style(9) compliant.

Why, because of the '-' left? It's no longer needed but we haven't eradicated from the tree.
If I once understood @imp correctly the order of (c) and SPDX may well likely change back to the predominant style in the OS world.

So even if not perfect this is fine to go in and should have long ago.

adrian added a subscriber: adrian.Thu, Sep 3, 2:47 PM

yeah just remove the - at that first comment line and then i'll be good to go

siri_racha.ca updated this revision to Diff 185736.Thu, Sep 3, 6:46 PM
siri_racha.ca marked 2 inline comments as done.

@bz @adrian @seuros I've removed the -

adrian accepted this revision.Thu, Sep 3, 6:51 PM
seuros accepted this revision.Thu, Sep 3, 6:59 PM
This revision is now accepted and ready to land.Thu, Sep 3, 6:59 PM
seuros edited the summary of this revision. (Show Details)Thu, Sep 3, 7:02 PM

@siri_racha.ca , i reformatted the summary, you can edit it if you wish.
It should be 80 columns or less.

siri_racha.ca added a comment.Thu, Sep 3, 8:03 PM

Thank you @seuros , I did also run a build test and it seems to build with no issues.

siri_racha.ca added a parent revision: D58075: LinuxKPI: Added jiffies64_to_msecs for amdkfd compatibility..Thu, Sep 3, 8:11 PM
siri_racha.ca removed a child revision: D58845: LinuxKPI: Add cpufreq_quick_get_max to LinuxKPI for amdkfd support.
siri_racha.ca added a child revision: D58228: LinuxKPI: Add tgid to task_struct under sched.h.Fri, Sep 4, 4:51 AM
bz accepted this revision.Sat, Sep 5, 9:30 AM

The commit message still says 6.12; should detail the move for 6.15. See also https://reviews.freebsd.org/D58254

Revision Contents
Changeset List

PathSize
sys/
compat/
linuxkpi/
common/
include/
linux/
16 lines

Diff 181868

View Options

sys/compat/linuxkpi/common/include/linux/util_macros.h

Loading...