Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_system_vold / b910e7e3252081033edb0a51c927a49aa99063f9
commitb910e7e3252081033edb0a51c927a49aa99063f9[log] [tgz]
authorWill McVicker <willmcvicker@google.com>Thu Dec 23 12:23:39 2021 -0800
committerWilliam McVicker <willmcvicker@google.com>Thu Dec 23 20:36:44 2021 +0000
tree78d4c3c6649980f48c47a106a27087535ab6848d
parent235d1d65f8d91ade54251f8132b06414f140054a [diff]
MetadataCrypt: fix timeout due to missing userdata dm device

We need to load the partition table before we can wait on the userdata
dm device because the kernel (as of [1] doesn't send the KOBJ_ADD uevent
until after the partition table is loaded. The new flow needs to be:

  CreateDevice() -> ioctl(DM_DEV_CREATE)
  LoadTableAndActivate() -> ioctl(DM_TABLE_LOAD)
  WaitForDevice()

This patch updates create_crypto_blk_dev() to first call
LoadTableAndActivate() before WaitForDevice().

[1] https://lore.kernel.org/all/20210804094147.459763-8-hch@lst.de/

Fixes: 156d9d229378 ("Pre-create userdata metadata encryption device.")
Bug: 210737958
Test: manually test booting raven with android13-5.15
Change-Id: Iab2214a62d44ba7e53b57f2cf0f08ac06c77b4fd
1 file changed
tree: 78d4c3c6649980f48c47a106a27087535ab6848d
  1. bench/
  2. binder/
  3. fs/
  4. model/
  5. tests/
  6. .clang-format ⇨ ../../build/soong/scripts/system-clang-format
  7. Android.bp
  8. AppFuseUtil.cpp
  9. AppFuseUtil.h
  10. Benchmark.cpp
  11. Benchmark.h
  12. BenchmarkGen.h
  13. Checkpoint.cpp
  14. Checkpoint.h
  15. CleanSpec.mk
  16. cryptfs.cpp
  17. cryptfs.h
  18. CryptoType.cpp
  19. CryptoType.h
  20. Devmapper.cpp
  21. Devmapper.h
  22. EncryptInplace.cpp
  23. EncryptInplace.h
  24. FileDeviceUtils.cpp
  25. FileDeviceUtils.h
  26. FsCrypt.cpp
  27. FsCrypt.h
  28. IdleMaint.cpp
  29. IdleMaint.h
  30. KeyBuffer.cpp
  31. KeyBuffer.h
  32. KeyStorage.cpp
  33. KeyStorage.h
  34. Keystore.cpp
  35. Keystore.h
  36. KeyUtil.cpp
  37. KeyUtil.h
  38. Loop.cpp
  39. Loop.h
  40. main.cpp
  41. MetadataCrypt.cpp
  42. MetadataCrypt.h
  43. MoveStorage.cpp
  44. MoveStorage.h
  45. NetlinkHandler.cpp
  46. NetlinkHandler.h
  47. NetlinkManager.cpp
  48. NetlinkManager.h
  49. OWNERS
  50. PREUPLOAD.cfg
  51. Process.cpp
  52. Process.h
  53. secdiscard.cpp
  54. sehandle.h
  55. TEST_MAPPING
  56. Utils.cpp
  57. Utils.h
  58. vdc.cpp
  59. vold.rc
  60. vold_prepare_subdirs.cpp
  61. VoldNativeService.cpp
  62. VoldNativeService.h
  63. VoldNativeServiceValidation.cpp
  64. VoldNativeServiceValidation.h
  65. VoldUtil.cpp
  66. VoldUtil.h
  67. VolumeManager.cpp
  68. VolumeManager.h