[XL] Change in fuchsia/fuchsia[main]: [block] Move to fuchsia.storage.block.Block

0 views

Skip to first unread message

'Ian McKellar (Gerrit)' via owners-override

unread,

Dec 23, 2025, 12:40:13 PM (4 days ago) Dec 23

to Owners Override

Attention needed from Owners Override and Suraj Malhotra

James Sullivan has uploaded the change for review

Ian McKellar would like Owners Override to review this change authored by James Sullivan.

Commit message

[block] Move to fuchsia.storage.block.Block

Currently, there are three FIDL protocols related to block devices:
- fuchsia.hardware.block.Block
- fuchsia.hardware.block.partition.Partition
- fuchsia.hardware.block.volume.Volume

Although they are separate, they are in fact essentially all the same
thing: Volume composes Partition which composes Block (so Volume
contains both), and all servers handle Volume.  So in practice, any
Block is also a Volume and vice versa.

This is confusing, so that's the first goal: Collapse all of these into
a single Block protocol.  The following changes were involved with this:
- Define fuchsia.storage.block.Block as a drop-in replacement for
  fuchsia.hardware.block.volume.Volume.
- Delete fuchsia.hardware.block.Block and
  fuchsia.hardware.block.partition.Partition.

(Note that we can't delete //sdk/fidl/fuchsia.hardware.block yet,
because it also has an Ftl protool, although that is never used in
practice and so I've marked that with a TODO for now.)

A secondary goal is to make it clearer that Block is not specifically a
driver-related protocol (which is what fuchsia.hardware.* implies).

This other point can be seen with the
fuchsia.hardware.block.volume.Service service, which is only exposed by
Driver Framework drivers; everything else on the system deals with the
Volume protocol itself, and there are numerous non-Driver components
which expose the Volume protocol (e.g. the GPT component which exposes
one per partition).

For this other goal, we make the following changes:
- Fully decouple fuchsia.hardware.block.driver from
  fuchsia.storage.block.  This required re-defining some types.
- Keep fuchsia.hardware.block.volume.Service where it is (which
  expresses that it is Driver-specific, and allows us to add other
  Driver-specific things there as needed), and have that service expose
  the fuchsia.storage.block.Block protocol.

Bug: 293946475

Change-Id: Idbe3d7fa543ad6a600a6816d1cfae084726e8e81

Run-All-Tests: true

Depends-on: turquoise-internal:Ibfe6f02c7122bd9d237e44e7f8128096e8208db8

Change diff

Change information

Files:

M docs/development/storage/storage-partition-routing.md
M sdk/fidl/fuchsia.fshost/BUILD.gn
M sdk/fidl/fuchsia.hardware.block.driver/BUILD.gn
M sdk/fidl/fuchsia.hardware.block.driver/block.fidl
D sdk/fidl/fuchsia.hardware.block.partition/BUILD.gn
D sdk/fidl/fuchsia.hardware.block.partition/partition.fidl
M sdk/fidl/fuchsia.hardware.block.volume/BUILD.gn
M sdk/fidl/fuchsia.hardware.block.volume/volume.fidl
M sdk/fidl/fuchsia.hardware.block/BUILD.gn
D sdk/fidl/fuchsia.hardware.block/block.fidl
M sdk/fidl/fuchsia.hardware.ramdisk/BUILD.gn
M sdk/fidl/fuchsia.hardware.ramdisk/ramdisk.fidl
A sdk/fidl/fuchsia.storage.block/BUILD.gn
A sdk/fidl/fuchsia.storage.block/block.fidl
M sdk/fidl/fuchsia.storage.partitions/BUILD.gn
M sdk/fidl/fuchsia.storage.partitions/partitions.fidl
M sdk/fidl/fuchsia.virtualization/BUILD.gn
M sdk/fidl/fuchsia.virtualization/guest_config.fidl
M src/bringup/bin/netsvc/BUILD.gn
M src/bringup/bin/waitfor/BUILD.gn
M src/bringup/bin/waitfor/waitfor.cc
M src/developer/adb/bin/adb-reboot/BUILD.gn
M src/developer/adb/bin/adb-reboot/adb-reboot-test.cc
M src/developer/adb/bin/adb-reboot/adb-reboot.cc
M src/developer/ffx/build/ffx_subtool_allowlist.gni
M src/devices/block/bin/biotime/BUILD.gn
M src/devices/block/bin/biotime/biotime.cc
M src/devices/block/bin/blktest/BUILD.gn
M src/devices/block/bin/blktest/blktest.cc
M src/devices/block/bin/fvm-check/main.cc
M src/devices/block/bin/gpt/BUILD.gn
M src/devices/block/bin/gpt/gpt.cc
M src/devices/block/bin/iochk/BUILD.gn
M src/devices/block/bin/iochk/iochk.cc
M src/devices/block/bin/iotime/BUILD.gn
M src/devices/block/bin/iotime/iotime.cc
M src/devices/block/bin/lsblk/BUILD.gn
M src/devices/block/bin/lsblk/main.cc
M src/devices/block/drivers/ahci/sata.cc
M src/devices/block/drivers/ahci/test/main.cc
M src/devices/block/drivers/block-verity/BUILD.gn
M src/devices/block/drivers/block-verity/block-verity-test.cc
M src/devices/block/drivers/block-verity/verified-volume-client.cc
M src/devices/block/drivers/block-verity/verified-volume-client.h
M src/devices/block/drivers/core/BUILD.gn
M src/devices/block/drivers/core/block-device.cc
M src/devices/block/drivers/core/block-device.h
M src/devices/block/drivers/core/server.cc
M src/devices/block/drivers/core/server.h
M src/devices/block/drivers/core/test/main.cc
M src/devices/block/drivers/core/test/server.cc
M src/devices/block/drivers/ftl/BUILD.gn
M src/devices/block/drivers/ftl/block_device.cc
M src/devices/block/drivers/ftl/block_device.h
M src/devices/block/drivers/ftl/tests/BUILD.gn
M src/devices/block/drivers/ftl/tests/block_device_test.cc
M src/devices/block/drivers/gpt/BUILD.gn
M src/devices/block/drivers/gpt/gpt.cc
M src/devices/block/drivers/gpt/gpt.h
M src/devices/block/drivers/gpt/gpt_device_test.cc
M src/devices/block/drivers/mbr/mbr-device-test.cc
M src/devices/block/drivers/nvme/namespace.cc
M src/devices/block/drivers/nvme/nvme-test.cc
M src/devices/block/drivers/ramdisk/BUILD.gn
M src/devices/block/drivers/ramdisk/test/BUILD.gn
M src/devices/block/drivers/ramdisk/test/ramdisk.cc
M src/devices/block/drivers/ramdisk/v2/ramdisk.cc
M src/devices/block/drivers/sdhci/BUILD.gn
M src/devices/block/drivers/sdhci/sdhci.cc
M src/devices/block/drivers/sdmmc/BUILD.gn
M src/devices/block/drivers/sdmmc/mmc.cc
M src/devices/block/drivers/sdmmc/sd.cc
M src/devices/block/drivers/sdmmc/sdmmc-block-device-test.cc
M src/devices/block/drivers/sdmmc/sdmmc-block-device.cc
M src/devices/block/drivers/sdmmc/sdmmc-partition-device.cc
M src/devices/block/drivers/usb-mass-storage/BUILD.gn
M src/devices/block/drivers/usb-mass-storage/tests/ums-test.cc
M src/devices/block/drivers/virtio/BUILD.gn
M src/devices/block/drivers/virtio/block.cc
M src/devices/block/drivers/virtio/block.h
M src/devices/block/drivers/virtio/block_test.cc
M src/devices/block/lib/scsi/BUILD.gn
M src/devices/block/lib/scsi/block-device.cc
M src/devices/block/lib/scsi/include/lib/scsi/block-device.h
M src/firmware/paver/BUILD.gn
M src/firmware/paver/abr-client.cc
M src/firmware/paver/block-devices.cc
M src/firmware/paver/block-devices.h
M src/firmware/paver/device-partitioner.h
M src/firmware/paver/fvm.cc
M src/firmware/paver/fvm.h
M src/firmware/paver/gpt.cc
M src/firmware/paver/gpt.h
M src/firmware/paver/moonflower.cc
M src/firmware/paver/partition-client.cc
M src/firmware/paver/partition-client.h
M src/firmware/paver/skip-block.cc
M src/firmware/paver/test/BUILD.gn
M src/firmware/paver/test/abr-test.cc
M src/firmware/paver/test/block-devices-test.cc
M src/firmware/paver/test/device-partitioner-test.cc
M src/firmware/paver/test/fvm-test.cc
M src/firmware/paver/test/paversvc-test.cc
M src/firmware/paver/test/test-utils.cc
M src/firmware/paver/test/test-utils.h
M src/firmware/paver/utils.cc
M src/firmware/paver/utils.h
M src/firmware/tests/nelson-partition-mapping/BUILD.gn
M src/firmware/tests/nelson-partition-mapping/main.cc
M src/recovery/diagnostics/gumshoe/BUILD.gn
M src/recovery/diagnostics/gumshoe/src/main.rs
M src/recovery/diagnostics/gumshoe/src/partition_reader.rs
M src/recovery/diagnostics/gumshoe/src/storage_info.rs
M src/recovery/factory_reset/BUILD.gn
M src/recovery/factory_reset/factory_reset.cc
M src/recovery/factory_reset/factory_reset_unittest.cc
M src/recovery/lib/installer/BUILD.gn
M src/recovery/lib/installer/src/partition.rs
M src/recovery/lib/recovery-util-block/BUILD.gn
M src/recovery/lib/recovery-util-block/src/lib.rs
M src/recovery/system/android/BUILD.gn
M src/recovery/system/android/src/bootloader.rs
M src/security/lib/zxcrypt/BUILD.gn
M src/security/lib/zxcrypt/fdio-volume.cc
M src/security/lib/zxcrypt/fdio-volume.h
M src/security/lib/zxcrypt/tests/BUILD.gn
M src/security/lib/zxcrypt/tests/test-device.cc
M src/security/lib/zxcrypt/tests/test-device.h
M src/security/lib/zxcrypt/tests/volume.cc
M src/starnix/kernel/core/BUILD.gn
M src/starnix/kernel/core/device/remote_block_device.rs
M src/starnix/lib/starnix_kernel_runner/src/container.rs
M src/storage/benchmarks/fuchsia/BUILD.gn
M src/storage/benchmarks/fuchsia/src/block_devices.rs
M src/storage/benchmarks/fuchsia/src/testing.rs
M src/storage/bin/dd/BUILD.gn
M src/storage/bin/dd/main.cc
M src/storage/blackout/target/fvm-minfs-random-op/src/main.rs
M src/storage/blackout/target/lib/BUILD.gn
M src/storage/blackout/target/lib/src/lib.rs
M src/storage/blobfs/BUILD.gn
M src/storage/blobfs/bin/BUILD.gn
M src/storage/blobfs/bin/blobfs_test.cc
M src/storage/blobfs/blobfs.cc
M src/storage/blobfs/blobfs.h
M src/storage/blobfs/blobfs_checker.cc
M src/storage/blobfs/mkfs.cc
M src/storage/blobfs/page_loader.cc
M src/storage/blobfs/service/startup.cc
M src/storage/blobfs/test/integration/blobfs_integration_test.cc
M src/storage/blobfs/test/integration/superblock_test.cc
M src/storage/blobfs/test/unit/blobfs_test.cc
M src/storage/blobfs/test/unit/format_test.cc
M src/storage/blobfs/test/unit/utils.cc
M src/storage/blobfs/test/unit/utils.h
M src/storage/block_adapter/BUILD.gn
M src/storage/block_adapter/src/lib.rs
M src/storage/block_adapter/src/main.rs
M src/storage/crypt/starnix/BUILD.gn
M src/storage/crypt/starnix/src/lib.rs
M src/storage/ext4/lib/parser/BUILD.gn
M src/storage/ext4/lib/parser/src/lib.rs
M src/storage/ext4/read-only/BUILD.gn
M src/storage/ext4/read-only/src/readers.rs
M src/storage/ext4/server/BUILD.gn
M src/storage/ext4/server/meta/ext4_readonly.cml
M src/storage/ext4/server/src/main.rs
M src/storage/ext4/server/tests/ext4_server_test.rs
M src/storage/f2fs/bcache.cc
M src/storage/f2fs/bcache.h
M src/storage/f2fs/bin/BUILD.gn
M src/storage/f2fs/bin/f2fs_test.cc
M src/storage/f2fs/mkfs.cc
M src/storage/f2fs/test/BUILD.gn
M src/storage/f2fs/test/compatibility/BUILD.gn
M src/storage/f2fs/test/compatibility/file_backed_block_device.cc
M src/storage/f2fs/test/compatibility/file_backed_block_device.h
M src/storage/f2fs/test/unit/bcache.cc
M src/storage/f2fs/test/unit/large_volume.cc
M src/storage/f2fs_reader/migrate/BUILD.gn
M src/storage/f2fs_reader/migrate/src/integration_test.rs
M src/storage/factory/export_ffs/BUILD.gn
M src/storage/factory/export_ffs/src/lib.rs
M src/storage/factory/export_ffs/src/main.rs
M src/storage/fidl/fuchsia.fs.startup/BUILD.gn
M src/storage/fidl/fuchsia.fs.startup/startup.fidl
M src/storage/fs_realm/BUILD.gn
M src/storage/fs_realm/src/main.rs
M src/storage/fs_test/BUILD.gn
M src/storage/fs_test/fs_test.cc
M src/storage/fs_test/json_filesystem.cc
M src/storage/fshost/BUILD.gn
M src/storage/fshost/integration/BUILD.gn
M src/storage/fshost/integration/src/disk_builder.rs
M src/storage/fshost/integration/src/lib.rs
M src/storage/fshost/integration/tests/fshost_integration_test.rs
M src/storage/fshost/integration/tests/system_volume_manipulation.rs
M src/storage/fshost/src/crypt/zxcrypt.rs
M src/storage/fshost/src/device.rs
M src/storage/fshost/src/environment.rs
M src/storage/fshost/src/environment/publisher.rs
M src/storage/fshost/src/matcher.rs
M src/storage/fshost/src/service.rs
M src/storage/fshost/src/volume.rs
M src/storage/fshost/src/watcher.rs
M src/storage/fuchsia-fatfs/BUILD.gn
M src/storage/fuchsia-fatfs/src/component.rs
M src/storage/fvm/BUILD.gn
M src/storage/fvm/client.cc
M src/storage/fvm/client_test.cc
M src/storage/fvm/driver/BUILD.gn
M src/storage/fvm/driver/test/BUILD.gn
M src/storage/fvm/driver/test/partition_load_test.cc
M src/storage/fvm/driver/test/volume_manager_api_test.cc
M src/storage/fvm/driver/vpartition_manager.cc
M src/storage/fvm/driver/vpartition_manager.h
M src/storage/fvm/driver/vpartition_manager_test.cc
M src/storage/fvm/format.cc
M src/storage/fvm/fvm_check.cc
M src/storage/fvm/fvm_check.h
M src/storage/fvm/fvm_driver_integration_test.cc
M src/storage/fvm/fvm_integration_test.cc
M src/storage/fvm/fvm_test_instance.cc
M src/storage/fvm/fvm_test_instance.h
M src/storage/fvm/resize_integration_test.cc
M src/storage/fvm/src/device.rs
M src/storage/fvm/src/main.rs
M src/storage/fvm/test_support.cc
M src/storage/fvm/test_support.h
M src/storage/fxfs/fidl/fuchsia.fxfs/BUILD.gn
M src/storage/fxfs/fidl/fuchsia.fxfs/fxfs.fidl
M src/storage/fxfs/platform/BUILD.gn
M src/storage/fxfs/platform/src/fuchsia/component.rs
M src/storage/fxfs/platform/src/fuchsia/device.rs
M src/storage/fxfs/platform/src/fuchsia/directory.rs
M src/storage/fxfs/platform/src/fuchsia/volume.rs
M src/storage/gpt/BUILD.gn
M src/storage/gpt/component/BUILD.gn
M src/storage/gpt/component/src/gpt.rs
M src/storage/gpt/component/src/integration_test.rs
M src/storage/gpt/component/src/partition.rs
M src/storage/gpt/component/src/service.rs
M src/storage/gpt/include/gpt/gpt.h
M src/storage/gpt/rust/BUILD.gn
M src/storage/gpt/rust/src/lib.rs
M src/storage/gpt/test/BUILD.gn
M src/storage/gpt/test/gpt-tests.cc
M src/storage/lib/block_client/cpp/BUILD.gn
M src/storage/lib/block_client/cpp/block_device.h
M src/storage/lib/block_client/cpp/client.cc
M src/storage/lib/block_client/cpp/client.h
M src/storage/lib/block_client/cpp/fake_block_device.cc
M src/storage/lib/block_client/cpp/fake_block_device.h
M src/storage/lib/block_client/cpp/fake_block_device_unittest.cc
M src/storage/lib/block_client/cpp/pass_through_read_only_device.h
M src/storage/lib/block_client/cpp/reader_writer.cc
M src/storage/lib/block_client/cpp/reader_writer_unittest.cc
M src/storage/lib/block_client/cpp/remote_block_device.cc
M src/storage/lib/block_client/cpp/remote_block_device.h
M src/storage/lib/block_client/cpp/remote_block_device_unittest.cc
M src/storage/lib/block_client/rust/BUILD.gn
M src/storage/lib/block_client/rust/src/fake_block_client.rs
M src/storage/lib/block_client/rust/src/lib.rs
M src/storage/lib/block_server/BUILD.gn
M src/storage/lib/block_server/block_server.cc
M src/storage/lib/block_server/block_server.h
M src/storage/lib/block_server/block_server_cc_tests.cc
M src/storage/lib/block_server/fake_server.h
M src/storage/lib/block_server/integration/BUILD.gn
M src/storage/lib/block_server/integration/src/lib.rs
M src/storage/lib/block_server/src/async_interface.rs
M src/storage/lib/block_server/src/c_interface.rs
M src/storage/lib/block_server/src/decompression_tests.rs
M src/storage/lib/block_server/src/lib.rs
M src/storage/lib/block_server/src/vmo_backed_server.rs
M src/storage/lib/fs_management/c/fvm.cc
M src/storage/lib/fs_management/c/fvm.h
M src/storage/lib/fs_management/cpp/BUILD.gn
M src/storage/lib/fs_management/cpp/admin.h
M src/storage/lib/fs_management/cpp/format.cc
M src/storage/lib/fs_management/cpp/format.h
M src/storage/lib/fs_management/cpp/format_test.cc
M src/storage/lib/fs_management/cpp/fsck.cc
M src/storage/lib/fs_management/cpp/fvm.cc
M src/storage/lib/fs_management/cpp/fvm.h
M src/storage/lib/fs_management/cpp/fvm_test.cc
M src/storage/lib/fs_management/cpp/mkfs.cc
M src/storage/lib/fs_management/cpp/mkfs_with_default.cc
M src/storage/lib/fs_management/cpp/mount.cc
M src/storage/lib/fs_management/cpp/mount.h
M src/storage/lib/fs_management/cpp/mount_test.cc
M src/storage/lib/fs_management/rust/BUILD.gn
M src/storage/lib/fs_management/rust/src/filesystem.rs
M src/storage/lib/fs_management/rust/src/format.rs
M src/storage/lib/fs_management/rust/src/partition.rs
M src/storage/lib/ramdevice_client/cpp/BUILD.gn
M src/storage/lib/ramdevice_client/cpp/include/ramdevice-client/ramdisk.h
M src/storage/lib/ramdevice_client/cpp/ramdisk.cc
M src/storage/lib/ramdevice_client/rust/BUILD.gn
M src/storage/lib/ramdevice_client/rust/src/lib.rs
M src/storage/lib/storage_device/src/block_device.rs
M src/storage/lib/vfs/cpp/inspect/BUILD.gn
M src/storage/lib/vfs/cpp/inspect/inspect_data.cc
M src/storage/lib/vfs/cpp/inspect/inspect_data_tests.cc
M src/storage/minfs/BUILD.gn
M src/storage/minfs/bcache.h
M src/storage/minfs/bin/BUILD.gn
M src/storage/minfs/bin/minfs_test.cc
M src/storage/minfs/minfs.cc
M src/storage/minfs/mount.cc
M src/storage/minfs/service/startup.cc
M src/storage/minfs/test/BUILD.gn
M src/storage/minfs/test/integration/fs_tests.cc
M src/storage/minfs/test/integration/mount_test.cc
M src/storage/minfs/test/unit/superblock_test.cc
M src/storage/minfs/test/unit/transaction_test.cc
M src/storage/stress-tests/fvm/BUILD.gn
M src/storage/stress-tests/fvm/volume.rs
M src/storage/stress-tests/utils/BUILD.gn
M src/storage/stress-tests/utils/fvm.rs
M src/storage/testing/BUILD.gn
M src/storage/testing/fvm.cc
M src/storage/testing/fvm.h
M src/storage/testing/rust/BUILD.gn
M src/storage/testing/rust/src/fvm.rs
M src/storage/testing/rust/src/lib.rs
M src/storage/testing/rust/src/zxcrypt.rs
M src/storage/tools/logs/run-with-logs/BUILD.gn
M src/storage/tools/logs/run-with-logs/src/main.rs
M src/storage/volume_image/adapter/BUILD.gn
M src/storage/volume_image/adapter/adapter_integration_test.cc
M src/storage/volume_image/fvm/fvm_sparse_image_reader_test.cc
M src/sys/lib/payload_streamer/BUILD.gn
M src/sys/lib/payload_streamer/src/lib.rs
M src/virtualization/bin/termina_guest_manager/BUILD.gn
M src/virtualization/bin/termina_guest_manager/block_devices.cc
M src/virtualization/bin/termina_guest_manager/block_devices.h
M src/virtualization/bin/termina_guest_manager/guest.cc
M src/virtualization/bin/vmm/device/virtio_block/BUILD.gn
M src/virtualization/bin/vmm/device/virtio_block/src/remote_backend.rs
M src/virtualization/lib/guest_config/guest_config.cc
M src/virtualization/tests/virtio_block_test_util/BUILD.gn
M src/virtualization/tests/virtio_block_test_util/src/fuchsia_main.rs
M src/zircon/bin/hwstress/BUILD.gn

Change size: XL

Delta: 344 files changed, 2411 insertions(+), 2544 deletions(-)

Open in Gerrit

Related details

Attention is currently required from:

Owners Override
Suraj Malhotra

Submit Requirements:

API-Review
Code-Owners
Code-Review
Dependencies-Satisfied
Review-Enforcement

Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings.

Gerrit

--
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to owners-overri...@fuchsia.dev.
To view this discussion visit https://groups.google.com/a/fuchsia.dev/d/msgid/owners-override/baa1bfc329c330d203566b0aff2b31eb23bf3665-HTML%40fuchsia-review.googlesource.com.

satisfied_requirement

unsatisfied_requirement

open

diffy

Reply all

Reply to author

Forward

0 new messages