libsysdecode: add zfs iocs
Needs ReviewPublic
Actions

Authored by yuripv on Jul 18 2023, 12:51 PM.

Details

Reviewers: None

Summary

We do not get usual definitions for ZFS ioctls and sys/fs/zfs.h
does not get installed, so this is a special case.

Test Plan

$ truss zpool get autotrim 2>&1 | grep ioctl
__sysctlbyname("vfs.zfs.version.ioctl",21,0x289547ea07b4,0x289547ea07b8,0x0,0) = 0 (0x0)
ioctl(3,ZFS_IOC_POOL_CONFIGS,0x289547ea07b8)     = 0 (0x0)
ioctl(3,ZFS_IOC_POOL_STATS,0x289547ea0778)       = 0 (0x0)
ioctl(3,ZFS_IOC_POOL_GET_PROPS,0x289547ea02c8)   = 0 (0x0)
ioctl(3,ZFS_IOC_POOL_STATS,0x289547ea0778)       = 0 (0x0)
ioctl(3,ZFS_IOC_POOL_GET_PROPS,0x289547ea02c8)   = 0 (0x0)
ioctl(3,ZFS_IOC_LOG_HISTORY,0x289547ea0a08)      ERR#1 'Operation not permitted'

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 52686
Build 49577: arc lint + arc unit

Event Timeline

yuripv created this revision.Jul 18 2023, 12:51 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 18 2023, 12:51 PM

yuripv requested review of this revision.Jul 18 2023, 12:51 PM

Harbormaster completed remote builds in B52683: Diff 124791.Jul 18 2023, 12:51 PM

yuripv edited the test plan for this revision. (Show Details)Jul 18 2023, 12:55 PM

add some \n's

Harbormaster completed remote builds in B52686: Diff 124795.Jul 18 2023, 3:03 PM

darius-dons.net.au added a subscriber: darius-dons.net.au.Jul 19 2023, 6:54 AM

darius-dons.net.au added inline comments.

lib/libsysdecode/mkioctls
80	Isn't hrtime_t a long long? (probably only an issue on 32 bit platforms)

yuripv marked an inline comment as done.Jul 19 2023, 7:40 AM

yuripv added inline comments.

lib/libsysdecode/mkioctls
80	it shouldn't really matter what type is specified as long as preprocessor groks this header without including the ones that provide real boolean_t and hrtime_t as that conflicts with other required headers here -- we are only interested in iocs enum and don't really use anything else (and the library was successfully built for lib32).

darius-dons.net.au added inline comments.Jul 19 2023, 8:05 AM

lib/libsysdecode/mkioctls
80	OK makes sense (I thought it might cause alignment problems.)

yuripv marked an inline comment as done.Jul 19 2023, 8:15 AM

cy added a subscriber: cy.Jul 19 2023, 1:12 PM

cy added inline comments.

lib/libsysdecode/mkioctls
107	Isn't this misplaced now?

yuripv marked an inline comment as done.Jul 19 2023, 1:36 PM

yuripv added inline comments.

lib/libsysdecode/mkioctls

107

No, awk part now prints the function header and "dynamic" ioctls, then we continue with zfs ones, and the print the function ending:

...
        else if (val == WDIOC_SETSOFTTIMEOUTACT)
                str = "WDIOC_SETSOFTTIMEOUTACT";
        else if (val == WDIOC_SETTIMEOUT)
                str = "WDIOC_SETTIMEOUT";
        else if ((val & 0xffff) == ZFS_IOC_BOOKMARK + ('Z' << 8))
                str = "ZFS_IOC_BOOKMARK";
        else if ((val & 0xffff) == ZFS_IOC_CHANGE_KEY + ('Z' << 8))
                str = "ZFS_IOC_CHANGE_KEY";
...