libprocstat: Drop zfs_defs.c hack, including its _KERNEL define
ClosedPublic
Actions

Authored by jrtc27 on Jun 6 2025, 2:15 PM.

Details

Reviewers

imp
kib
markj
mm

Commits

rG66cc116bb2c1: libprocstat: Drop zfs_defs.c hack, including its _KERNEL define

Summary

Now that we have a _WANT_ZNODE we can use that instead of defining
_KERNEL, and we're able to move the code back into zfs.c using a real
znode_t pointer.

Whilst here, tidy the includes.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 64678
Build 61562: arc lint + arc unit

Event Timeline

jrtc27 created this revision.Jun 6 2025, 2:15 PM

Herald added a subscriber: delphij. · View Herald TranscriptJun 6 2025, 2:15 PM

jrtc27 requested review of this revision.Jun 6 2025, 2:15 PM

Harbormaster completed remote builds in B64678: Diff 156638.Jun 6 2025, 2:15 PM

jrtc27 added parent revisions: D50719: libprocstat: Drop all _KERNEL defines outside of zfs_defs.c, D50720: openzfs: Add a _WANT_ZNODE that defines struct znode / znode_t for userspace.Jun 6 2025, 2:16 PM

Trim and sort CFLAGS

Harbormaster completed remote builds in B64683: Diff 156643.Jun 6 2025, 2:32 PM

jrtc27 edited the summary of this revision. (Show Details)Jun 6 2025, 2:33 PM

Thanks

lib/libprocstat/Makefile
71	What a long list of args. Any chance there's a make variable for all this?
lib/libprocstat/zfs.c
45	Why move it? Just tidying or was the old location now breaking? The move is fine, but I'm curious.

imp accepted this revision.Jun 6 2025, 2:54 PM

This revision is now accepted and ready to land.Jun 6 2025, 2:54 PM

jrtc27 added inline comments.Jun 6 2025, 3:08 PM

lib/libprocstat/Makefile
71	Of course not :) don't go looking for how many similar copies of this there are. The real answer is probably in part at least that it needs to vary between uses...
lib/libprocstat/zfs.c
45	Just tidying as a good citizen

kib accepted this revision.Jun 7 2025, 5:37 AM

kib added inline comments.

lib/libprocstat/zfs.c
83–84	Is this comment still relevant?

markj accepted this revision.Jun 7 2025, 12:57 PM

jrtc27 added inline comments.Jun 16 2025, 7:39 PM

lib/libprocstat/zfs.c
83–84	Yes :( OpenZFS's SPL shadows sys/vnode.h with its own that doesn't include ours; IIRC the end result is struct vnode is an incomplete type here. OpenZFS is still a pile of hacks in the name of trying to pretend both its supported OSes are Solaris, rather than using its own namespaced abstractions...

imp added inline comments.Jun 16 2025, 7:44 PM

lib/libprocstat/zfs.c
83–84	Indeed. The OpenZFS integration is its own special kind of hell. Too much is inlined, so too many things need to know about other things and the namespace abstractions are just barely up to the task, but here's one of the holes for sure.

kib added inline comments.Jun 16 2025, 8:00 PM

lib/libprocstat/zfs.c
83–84	Your rant is better than the cryptic comment above, I suggest you to put in there. Perhaps in the separate commit to not delay this one. Also, in commit above, if kept, vnode.h should be replaced by freebsd/sys/sys/vnode.h or such.