Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Enhance ioctl number checks 

When checking ZFS_IOC_* numbers, print which numbers are wrong rather
than silently failing.

Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9187
This commit is contained in:
Ryan Moeller 2019-08-22 12:44:11 -04:00 committed by Brian Behlendorf
parent 20f7b917aa
commit f591a581d6
1 changed files with 99 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
View File

@ -862,93 +862,105 @@ enum zfs_ioc_ref {
boolean_t boolean_t
validate_ioc_values(void) validate_ioc_values(void)
{ {
return ( boolean_t result = TRUE;
ZFS_IOC_BASE + 0 == ZFS_IOC_POOL_CREATE &&
ZFS_IOC_BASE + 1 == ZFS_IOC_POOL_DESTROY && #define CHECK(expr) do { \
ZFS_IOC_BASE + 2 == ZFS_IOC_POOL_IMPORT && if (!(expr)) { \
ZFS_IOC_BASE + 3 == ZFS_IOC_POOL_EXPORT && result = FALSE; \
ZFS_IOC_BASE + 4 == ZFS_IOC_POOL_CONFIGS && fprintf(stderr, "(%s) === FALSE\n", #expr); \
ZFS_IOC_BASE + 5 == ZFS_IOC_POOL_STATS && } \
ZFS_IOC_BASE + 6 == ZFS_IOC_POOL_TRYIMPORT && } while (0)
ZFS_IOC_BASE + 7 == ZFS_IOC_POOL_SCAN &&
ZFS_IOC_BASE + 8 == ZFS_IOC_POOL_FREEZE && CHECK(ZFS_IOC_BASE + 0 == ZFS_IOC_POOL_CREATE);
ZFS_IOC_BASE + 9 == ZFS_IOC_POOL_UPGRADE && CHECK(ZFS_IOC_BASE + 1 == ZFS_IOC_POOL_DESTROY);
ZFS_IOC_BASE + 10 == ZFS_IOC_POOL_GET_HISTORY && CHECK(ZFS_IOC_BASE + 2 == ZFS_IOC_POOL_IMPORT);
ZFS_IOC_BASE + 11 == ZFS_IOC_VDEV_ADD && CHECK(ZFS_IOC_BASE + 3 == ZFS_IOC_POOL_EXPORT);
ZFS_IOC_BASE + 12 == ZFS_IOC_VDEV_REMOVE && CHECK(ZFS_IOC_BASE + 4 == ZFS_IOC_POOL_CONFIGS);
ZFS_IOC_BASE + 13 == ZFS_IOC_VDEV_SET_STATE && CHECK(ZFS_IOC_BASE + 5 == ZFS_IOC_POOL_STATS);
ZFS_IOC_BASE + 14 == ZFS_IOC_VDEV_ATTACH && CHECK(ZFS_IOC_BASE + 6 == ZFS_IOC_POOL_TRYIMPORT);
ZFS_IOC_BASE + 15 == ZFS_IOC_VDEV_DETACH && CHECK(ZFS_IOC_BASE + 7 == ZFS_IOC_POOL_SCAN);
ZFS_IOC_BASE + 16 == ZFS_IOC_VDEV_SETPATH && CHECK(ZFS_IOC_BASE + 8 == ZFS_IOC_POOL_FREEZE);
ZFS_IOC_BASE + 17 == ZFS_IOC_VDEV_SETFRU && CHECK(ZFS_IOC_BASE + 9 == ZFS_IOC_POOL_UPGRADE);
ZFS_IOC_BASE + 18 == ZFS_IOC_OBJSET_STATS && CHECK(ZFS_IOC_BASE + 10 == ZFS_IOC_POOL_GET_HISTORY);
ZFS_IOC_BASE + 19 == ZFS_IOC_OBJSET_ZPLPROPS && CHECK(ZFS_IOC_BASE + 11 == ZFS_IOC_VDEV_ADD);
ZFS_IOC_BASE + 20 == ZFS_IOC_DATASET_LIST_NEXT && CHECK(ZFS_IOC_BASE + 12 == ZFS_IOC_VDEV_REMOVE);
ZFS_IOC_BASE + 21 == ZFS_IOC_SNAPSHOT_LIST_NEXT && CHECK(ZFS_IOC_BASE + 13 == ZFS_IOC_VDEV_SET_STATE);
ZFS_IOC_BASE + 22 == ZFS_IOC_SET_PROP && CHECK(ZFS_IOC_BASE + 14 == ZFS_IOC_VDEV_ATTACH);
ZFS_IOC_BASE + 23 == ZFS_IOC_CREATE && CHECK(ZFS_IOC_BASE + 15 == ZFS_IOC_VDEV_DETACH);
ZFS_IOC_BASE + 24 == ZFS_IOC_DESTROY && CHECK(ZFS_IOC_BASE + 16 == ZFS_IOC_VDEV_SETPATH);
ZFS_IOC_BASE + 25 == ZFS_IOC_ROLLBACK && CHECK(ZFS_IOC_BASE + 17 == ZFS_IOC_VDEV_SETFRU);
ZFS_IOC_BASE + 26 == ZFS_IOC_RENAME && CHECK(ZFS_IOC_BASE + 18 == ZFS_IOC_OBJSET_STATS);
ZFS_IOC_BASE + 27 == ZFS_IOC_RECV && CHECK(ZFS_IOC_BASE + 19 == ZFS_IOC_OBJSET_ZPLPROPS);
ZFS_IOC_BASE + 28 == ZFS_IOC_SEND && CHECK(ZFS_IOC_BASE + 20 == ZFS_IOC_DATASET_LIST_NEXT);
ZFS_IOC_BASE + 29 == ZFS_IOC_INJECT_FAULT && CHECK(ZFS_IOC_BASE + 21 == ZFS_IOC_SNAPSHOT_LIST_NEXT);
ZFS_IOC_BASE + 30 == ZFS_IOC_CLEAR_FAULT && CHECK(ZFS_IOC_BASE + 22 == ZFS_IOC_SET_PROP);
ZFS_IOC_BASE + 31 == ZFS_IOC_INJECT_LIST_NEXT && CHECK(ZFS_IOC_BASE + 23 == ZFS_IOC_CREATE);
ZFS_IOC_BASE + 32 == ZFS_IOC_ERROR_LOG && CHECK(ZFS_IOC_BASE + 24 == ZFS_IOC_DESTROY);
ZFS_IOC_BASE + 33 == ZFS_IOC_CLEAR && CHECK(ZFS_IOC_BASE + 25 == ZFS_IOC_ROLLBACK);
ZFS_IOC_BASE + 34 == ZFS_IOC_PROMOTE && CHECK(ZFS_IOC_BASE + 26 == ZFS_IOC_RENAME);
ZFS_IOC_BASE + 35 == ZFS_IOC_SNAPSHOT && CHECK(ZFS_IOC_BASE + 27 == ZFS_IOC_RECV);
ZFS_IOC_BASE + 36 == ZFS_IOC_DSOBJ_TO_DSNAME && CHECK(ZFS_IOC_BASE + 28 == ZFS_IOC_SEND);
ZFS_IOC_BASE + 37 == ZFS_IOC_OBJ_TO_PATH && CHECK(ZFS_IOC_BASE + 29 == ZFS_IOC_INJECT_FAULT);
ZFS_IOC_BASE + 38 == ZFS_IOC_POOL_SET_PROPS && CHECK(ZFS_IOC_BASE + 30 == ZFS_IOC_CLEAR_FAULT);
ZFS_IOC_BASE + 39 == ZFS_IOC_POOL_GET_PROPS && CHECK(ZFS_IOC_BASE + 31 == ZFS_IOC_INJECT_LIST_NEXT);
ZFS_IOC_BASE + 40 == ZFS_IOC_SET_FSACL && CHECK(ZFS_IOC_BASE + 32 == ZFS_IOC_ERROR_LOG);
ZFS_IOC_BASE + 41 == ZFS_IOC_GET_FSACL && CHECK(ZFS_IOC_BASE + 33 == ZFS_IOC_CLEAR);
ZFS_IOC_BASE + 42 == ZFS_IOC_SHARE && CHECK(ZFS_IOC_BASE + 34 == ZFS_IOC_PROMOTE);
ZFS_IOC_BASE + 43 == ZFS_IOC_INHERIT_PROP && CHECK(ZFS_IOC_BASE + 35 == ZFS_IOC_SNAPSHOT);
ZFS_IOC_BASE + 44 == ZFS_IOC_SMB_ACL && CHECK(ZFS_IOC_BASE + 36 == ZFS_IOC_DSOBJ_TO_DSNAME);
ZFS_IOC_BASE + 45 == ZFS_IOC_USERSPACE_ONE && CHECK(ZFS_IOC_BASE + 37 == ZFS_IOC_OBJ_TO_PATH);
ZFS_IOC_BASE + 46 == ZFS_IOC_USERSPACE_MANY && CHECK(ZFS_IOC_BASE + 38 == ZFS_IOC_POOL_SET_PROPS);
ZFS_IOC_BASE + 47 == ZFS_IOC_USERSPACE_UPGRADE && CHECK(ZFS_IOC_BASE + 39 == ZFS_IOC_POOL_GET_PROPS);
ZFS_IOC_BASE + 48 == ZFS_IOC_HOLD && CHECK(ZFS_IOC_BASE + 40 == ZFS_IOC_SET_FSACL);
ZFS_IOC_BASE + 49 == ZFS_IOC_RELEASE && CHECK(ZFS_IOC_BASE + 41 == ZFS_IOC_GET_FSACL);
ZFS_IOC_BASE + 50 == ZFS_IOC_GET_HOLDS && CHECK(ZFS_IOC_BASE + 42 == ZFS_IOC_SHARE);
ZFS_IOC_BASE + 51 == ZFS_IOC_OBJSET_RECVD_PROPS && CHECK(ZFS_IOC_BASE + 43 == ZFS_IOC_INHERIT_PROP);
ZFS_IOC_BASE + 52 == ZFS_IOC_VDEV_SPLIT && CHECK(ZFS_IOC_BASE + 44 == ZFS_IOC_SMB_ACL);
ZFS_IOC_BASE + 53 == ZFS_IOC_NEXT_OBJ && CHECK(ZFS_IOC_BASE + 45 == ZFS_IOC_USERSPACE_ONE);
ZFS_IOC_BASE + 54 == ZFS_IOC_DIFF && CHECK(ZFS_IOC_BASE + 46 == ZFS_IOC_USERSPACE_MANY);
ZFS_IOC_BASE + 55 == ZFS_IOC_TMP_SNAPSHOT && CHECK(ZFS_IOC_BASE + 47 == ZFS_IOC_USERSPACE_UPGRADE);
ZFS_IOC_BASE + 56 == ZFS_IOC_OBJ_TO_STATS && CHECK(ZFS_IOC_BASE + 48 == ZFS_IOC_HOLD);
ZFS_IOC_BASE + 57 == ZFS_IOC_SPACE_WRITTEN && CHECK(ZFS_IOC_BASE + 49 == ZFS_IOC_RELEASE);
ZFS_IOC_BASE + 58 == ZFS_IOC_SPACE_SNAPS && CHECK(ZFS_IOC_BASE + 50 == ZFS_IOC_GET_HOLDS);
ZFS_IOC_BASE + 59 == ZFS_IOC_DESTROY_SNAPS && CHECK(ZFS_IOC_BASE + 51 == ZFS_IOC_OBJSET_RECVD_PROPS);
ZFS_IOC_BASE + 60 == ZFS_IOC_POOL_REGUID && CHECK(ZFS_IOC_BASE + 52 == ZFS_IOC_VDEV_SPLIT);
ZFS_IOC_BASE + 61 == ZFS_IOC_POOL_REOPEN && CHECK(ZFS_IOC_BASE + 53 == ZFS_IOC_NEXT_OBJ);
ZFS_IOC_BASE + 62 == ZFS_IOC_SEND_PROGRESS && CHECK(ZFS_IOC_BASE + 54 == ZFS_IOC_DIFF);
ZFS_IOC_BASE + 63 == ZFS_IOC_LOG_HISTORY && CHECK(ZFS_IOC_BASE + 55 == ZFS_IOC_TMP_SNAPSHOT);
ZFS_IOC_BASE + 64 == ZFS_IOC_SEND_NEW && CHECK(ZFS_IOC_BASE + 56 == ZFS_IOC_OBJ_TO_STATS);
ZFS_IOC_BASE + 65 == ZFS_IOC_SEND_SPACE && CHECK(ZFS_IOC_BASE + 57 == ZFS_IOC_SPACE_WRITTEN);
ZFS_IOC_BASE + 66 == ZFS_IOC_CLONE && CHECK(ZFS_IOC_BASE + 58 == ZFS_IOC_SPACE_SNAPS);
ZFS_IOC_BASE + 67 == ZFS_IOC_BOOKMARK && CHECK(ZFS_IOC_BASE + 59 == ZFS_IOC_DESTROY_SNAPS);
ZFS_IOC_BASE + 68 == ZFS_IOC_GET_BOOKMARKS && CHECK(ZFS_IOC_BASE + 60 == ZFS_IOC_POOL_REGUID);
ZFS_IOC_BASE + 69 == ZFS_IOC_DESTROY_BOOKMARKS && CHECK(ZFS_IOC_BASE + 61 == ZFS_IOC_POOL_REOPEN);
ZFS_IOC_BASE + 70 == ZFS_IOC_RECV_NEW && CHECK(ZFS_IOC_BASE + 62 == ZFS_IOC_SEND_PROGRESS);
ZFS_IOC_BASE + 71 == ZFS_IOC_POOL_SYNC && CHECK(ZFS_IOC_BASE + 63 == ZFS_IOC_LOG_HISTORY);
ZFS_IOC_BASE + 72 == ZFS_IOC_CHANNEL_PROGRAM && CHECK(ZFS_IOC_BASE + 64 == ZFS_IOC_SEND_NEW);
ZFS_IOC_BASE + 73 == ZFS_IOC_LOAD_KEY && CHECK(ZFS_IOC_BASE + 65 == ZFS_IOC_SEND_SPACE);
ZFS_IOC_BASE + 74 == ZFS_IOC_UNLOAD_KEY && CHECK(ZFS_IOC_BASE + 66 == ZFS_IOC_CLONE);
ZFS_IOC_BASE + 75 == ZFS_IOC_CHANGE_KEY && CHECK(ZFS_IOC_BASE + 67 == ZFS_IOC_BOOKMARK);
ZFS_IOC_BASE + 76 == ZFS_IOC_REMAP && CHECK(ZFS_IOC_BASE + 68 == ZFS_IOC_GET_BOOKMARKS);
ZFS_IOC_BASE + 77 == ZFS_IOC_POOL_CHECKPOINT && CHECK(ZFS_IOC_BASE + 69 == ZFS_IOC_DESTROY_BOOKMARKS);
ZFS_IOC_BASE + 78 == ZFS_IOC_POOL_DISCARD_CHECKPOINT && CHECK(ZFS_IOC_BASE + 70 == ZFS_IOC_RECV_NEW);
ZFS_IOC_BASE + 79 == ZFS_IOC_POOL_INITIALIZE && CHECK(ZFS_IOC_BASE + 71 == ZFS_IOC_POOL_SYNC);
ZFS_IOC_BASE + 80 == ZFS_IOC_POOL_TRIM && CHECK(ZFS_IOC_BASE + 72 == ZFS_IOC_CHANNEL_PROGRAM);
ZFS_IOC_BASE + 81 == ZFS_IOC_REDACT && CHECK(ZFS_IOC_BASE + 73 == ZFS_IOC_LOAD_KEY);
ZFS_IOC_BASE + 82 == ZFS_IOC_GET_BOOKMARK_PROPS && CHECK(ZFS_IOC_BASE + 74 == ZFS_IOC_UNLOAD_KEY);
LINUX_IOC_BASE + 1 == ZFS_IOC_EVENTS_NEXT && CHECK(ZFS_IOC_BASE + 75 == ZFS_IOC_CHANGE_KEY);
LINUX_IOC_BASE + 2 == ZFS_IOC_EVENTS_CLEAR && CHECK(ZFS_IOC_BASE + 76 == ZFS_IOC_REMAP);
LINUX_IOC_BASE + 3 == ZFS_IOC_EVENTS_SEEK); CHECK(ZFS_IOC_BASE + 77 == ZFS_IOC_POOL_CHECKPOINT);
CHECK(ZFS_IOC_BASE + 78 == ZFS_IOC_POOL_DISCARD_CHECKPOINT);
CHECK(ZFS_IOC_BASE + 79 == ZFS_IOC_POOL_INITIALIZE);
CHECK(ZFS_IOC_BASE + 80 == ZFS_IOC_POOL_TRIM);
CHECK(ZFS_IOC_BASE + 81 == ZFS_IOC_REDACT);
CHECK(ZFS_IOC_BASE + 82 == ZFS_IOC_GET_BOOKMARK_PROPS);
CHECK(LINUX_IOC_BASE + 1 == ZFS_IOC_EVENTS_NEXT);
CHECK(LINUX_IOC_BASE + 2 == ZFS_IOC_EVENTS_CLEAR);
CHECK(LINUX_IOC_BASE + 3 == ZFS_IOC_EVENTS_SEEK);
#undef CHECK
return (result);
} }
int int