Convert enum zio_flag to uint64_t #14086

ryao · 2022-10-25T22:27:55Z

Motivation and Context

We ran out of space in enum zio_flag for additional flags.

Description

Rather than introduce enum zio_flag2 and then modify a bunch of functions to take a second flags variable, we expand the type to 64 bits via typedef uint64_t zio_flag_t.

Note that I signed off using my Klara Systems email because the copyright ownership belongs to Klara Systems. This is unlike my previous commits, the most recent of which were done with my university email.

How Has This Been Tested?

Build test and runtime tests have been done.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Performance enhancement (non-breaking change which improves efficiency)
Code cleanup (non-breaking change which makes code smaller or more readable)
Breaking change (fix or feature that would cause existing functionality to change)
Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the OpenZFS code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
I have run the ZFS Test Suite with this change applied.
All commit messages are properly formatted and contain Signed-off-by.

allanjude

Signed-off-by: Allan Jude <allan@klarasystems.com>

module/zfs/zio.c

include/sys/zio.h

module/zfs/zio.c

We ran out of space in enum zio_flag for additional flags. Rather than introduce enum zio_flag2 and then modify a bunch of functions to take a second flags variable, we expand the type to 64 bits via `typedef uint64_t zio_flag_t`. Signed-off-by: Richard Yao <richard.yao@klarasystems.com> Signed-off-by: Allan Jude <allan@klarasystems.com>

We ran out of space in enum zio_flag for additional flags. Rather than introduce enum zio_flag2 and then modify a bunch of functions to take a second flags variable, we expand the type to 64 bits via `typedef uint64_t zio_flag_t`. Reviewed-by: Allan Jude <allan@klarasystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Richard Yao <richard.yao@klarasystems.com> Signed-off-by: Allan Jude <allan@klarasystems.com> Co-authored-by: Richard Yao <richard.yao@klarasystems.com> Closes openzfs#14086

In 4938d01 (openzfs#14086) zio_flag_t was converted from an enum (generally signed 32-bit) to a uint64_t. The corresponding change wasn't made to the error reporting subsystem, limiting the error flags being delivered to zed to 32 bits. This bumps the whole pipeline to use uint64s. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <rob.norris@klarasystems.com>

In 4938d01 (openzfs#14086) zio_flag_t was converted from an enum (generally signed 32-bit) to a uint64_t. The corresponding change wasn't made to the error reporting subsystem, limiting the error flags being delivered to zed to 32 bits. This bumps the whole pipeline to use uint64s. A tiny bit of compatibility is added for newer zed working agsinst an older kernel module, because its easy to do and misdetecting scrub/resilver errors and taking action is potentially dangerous. Making it work for new kernel modules against older zed seems to be far more invasive for far less benefit, so I have not. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <rob.norris@klarasystems.com>

In 4938d01 (#14086) zio_flag_t was converted from an enum (generally signed 32-bit) to a uint64_t. The corresponding change wasn't made to the error reporting subsystem, limiting the error flags being delivered to zed to 32 bits. This bumps the whole pipeline to use uint64s. A tiny bit of compatibility is added for newer zed working agsinst an older kernel module, because its easy to do and misdetecting scrub/resilver errors and taking action is potentially dangerous. Making it work for new kernel modules against older zed seems to be far more invasive for far less benefit, so I have not. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes #16469

In 4938d01 (openzfs#14086) zio_flag_t was converted from an enum (generally signed 32-bit) to a uint64_t. The corresponding change wasn't made to the error reporting subsystem, limiting the error flags being delivered to zed to 32 bits. This bumps the whole pipeline to use uint64s. A tiny bit of compatibility is added for newer zed working agsinst an older kernel module, because its easy to do and misdetecting scrub/resilver errors and taking action is potentially dangerous. Making it work for new kernel modules against older zed seems to be far more invasive for far less benefit, so I have not. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes openzfs#16469

allanjude approved these changes Oct 25, 2022

View reviewed changes

ryao force-pushed the zio_flag branch from a77917c to 8f31872 Compare October 25, 2022 22:57

ryao commented Oct 26, 2022

View reviewed changes

module/zfs/zio.c Outdated Show resolved Hide resolved

behlendorf reviewed Oct 26, 2022

View reviewed changes

include/sys/zio.h Show resolved Hide resolved

include/sys/zio.h Outdated Show resolved Hide resolved

module/zfs/zio.c Outdated Show resolved Hide resolved

behlendorf added the Status: Code Review Needed Ready for review and testing label Oct 26, 2022

ryao force-pushed the zio_flag branch from 8f31872 to a02869a Compare October 26, 2022 21:55

behlendorf approved these changes Oct 26, 2022

View reviewed changes

behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Oct 26, 2022

behlendorf merged commit 4938d01 into openzfs:master Oct 27, 2022

robn mentioned this pull request Aug 22, 2024

fm: pass io_flags through events & zed as uint64_t #16469

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert enum zio_flag to uint64_t #14086

Convert enum zio_flag to uint64_t #14086

ryao commented Oct 25, 2022

allanjude left a comment

Convert enum zio_flag to uint64_t #14086

Convert enum zio_flag to uint64_t #14086

Conversation

ryao commented Oct 25, 2022

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

allanjude left a comment

Choose a reason for hiding this comment