Yo Chiang
f5d57aefc0
Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir" am: 346e6792b4 am: 99436bf2aa am: 4c22f00ec1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452359
Change-Id: I4bb659211843f1e81790a276f6cd6a36e4b972e9
2020-10-26 06:37:08 +00:00
Yo Chiang
4c22f00ec1
Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir" am: 346e6792b4 am: 99436bf2aa
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452359
Change-Id: I20626e2d334ae52396f0b8e50c5dc3cb1556bc1d
2020-10-26 06:20:26 +00:00
Yo Chiang
99436bf2aa
Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir" am: 346e6792b4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452359
Change-Id: I1f511c4873b5daf34a748ec318d020d1749293e9
2020-10-26 05:49:35 +00:00
Yo Chiang
346e6792b4
Merge "Call GetDsuMetadataKeyDir() for DSU metadata encryption dir"
2020-10-26 05:27:36 +00:00
David Anderson
1c9fbfbd83
Merge "snapuserd: Refactor client to allow persistent connections." am: 45662c8941 am: cc747f8500 am: 140feb62f6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468411
Change-Id: I9ba8d35e89b2f7f640d7ea7bf761c0489acd863e
2020-10-24 00:05:57 +00:00
David Anderson
140feb62f6
Merge "snapuserd: Refactor client to allow persistent connections." am: 45662c8941 am: cc747f8500
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468411
Change-Id: I86a847218af3a307ee5babdf6961ceaa55901223
2020-10-23 23:50:15 +00:00
David Anderson
cc747f8500
Merge "snapuserd: Refactor client to allow persistent connections." am: 45662c8941
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468411
Change-Id: If97a8dae405d5a40419f444ef30b8dbd6ffea219
2020-10-23 23:36:07 +00:00
David Anderson
45662c8941
Merge "snapuserd: Refactor client to allow persistent connections."
2020-10-23 22:01:42 +00:00
David Anderson
eeba09c35b
Merge "snapuserd: Refactor daemon/server." am: 8425f6e6e6 am: de005e145f am: 975d3eb45f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468410
Change-Id: Idbfc521ca9bb460695c8e5f5df6c07b0fd81f43b
2020-10-23 21:11:29 +00:00
David Anderson
975d3eb45f
Merge "snapuserd: Refactor daemon/server." am: 8425f6e6e6 am: de005e145f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468410
Change-Id: Ic2bf59f35edfe120faf90caba1cc1816a51ad4c1
2020-10-23 21:00:54 +00:00
David Anderson
de005e145f
Merge "snapuserd: Refactor daemon/server." am: 8425f6e6e6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468410
Change-Id: I4286b948eba40d76fb7af438c6312af910cbaafc
2020-10-23 20:24:19 +00:00
Colin Cross
0ccd8da894
Merge "Make the connection between implementation and llndk_library explicit" am: b527e66392 am: 656f97cf61 am: 561f665302
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466034
Change-Id: Id32b145f74ceb9a90c78e6995fa369c8b01b15ae
2020-10-23 19:42:39 +00:00
Primiano Tucci
4d52531ed6
Merge "Introduce security.lower_kptr_restrict property" am: 24a21867e7 am: 8ff9efc482 am: 47319cec95
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455185
Change-Id: Ib235c80b749502e397e6d33877b939a9714eb5cb
2020-10-23 19:42:01 +00:00
Colin Cross
561f665302
Merge "Make the connection between implementation and llndk_library explicit" am: b527e66392 am: 656f97cf61
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466034
Change-Id: Ic800538d64dcebf791192c949d9bd3c9b584d8cf
2020-10-23 19:24:44 +00:00
Primiano Tucci
47319cec95
Merge "Introduce security.lower_kptr_restrict property" am: 24a21867e7 am: 8ff9efc482
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455185
Change-Id: Ia034b5092ef8c6c3c80e7d217872e6665cb5d2ca
2020-10-23 19:24:11 +00:00
Colin Cross
656f97cf61
Merge "Make the connection between implementation and llndk_library explicit" am: b527e66392
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466034
Change-Id: If141d48c86a43c59f388115c5eebc3589bdd5b17
2020-10-23 19:00:06 +00:00
Primiano Tucci
8ff9efc482
Merge "Introduce security.lower_kptr_restrict property" am: 24a21867e7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455185
Change-Id: I23669ae623e3bdd3694766dda3704a97c3db2144
2020-10-23 18:58:49 +00:00
David Anderson
8425f6e6e6
Merge "snapuserd: Refactor daemon/server."
2020-10-23 18:33:15 +00:00
Colin Cross
b527e66392
Merge "Make the connection between implementation and llndk_library explicit"
2020-10-23 18:09:42 +00:00
Primiano Tucci
24a21867e7
Merge "Introduce security.lower_kptr_restrict property"
2020-10-23 18:03:30 +00:00
Treehugger Robot
35700ea2ed
Merge "fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition" am: d0ce499873 am: 959048182b am: 7a956ed1df
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1471662
Change-Id: I2f2505dc5b420acc9abc34c1f0829dcb34398bfd
2020-10-23 17:25:32 +00:00
Baligh Uddin
7ba1608e97
[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 3f52272883 am: 53f75c82ce -s ours am: 1e1091f218 -s ours
...
am skip reason: Change-Id Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d with SHA-1 efe701798b is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465244
Change-Id: I7ed97a1480eb04393c8a1bbd20f5058e4519ed9d
2020-10-23 17:24:25 +00:00
Treehugger Robot
7a956ed1df
Merge "fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition" am: d0ce499873 am: 959048182b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1471662
Change-Id: Iaabb014740a77a72a27090c82aceb90cdeadc2be
2020-10-23 16:56:28 +00:00
Baligh Uddin
1e1091f218
[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" am: 3f52272883 am: 53f75c82ce -s ours
...
am skip reason: Change-Id Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d with SHA-1 efe701798b is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465244
Change-Id: I0d4f36695de8c1a445aa3662722af1788d5ae4cd
2020-10-23 16:55:32 +00:00
Treehugger Robot
959048182b
Merge "fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition" am: d0ce499873
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1471662
Change-Id: I7ae318f77c5f5dbb295b25f69b0d500f2bdabbc4
2020-10-23 16:49:21 +00:00
Treehugger Robot
d0ce499873
Merge "fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition"
2020-10-23 16:47:43 +00:00
Baligh Uddin
53f75c82ce
Merge "Migrate system/core/adb to packages/modules/adb" am: 3f52272883
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465244
Change-Id: Ia0799b6599336b7769afe2bad79bf816a8f645b2
2020-10-23 16:39:25 +00:00
Baligh Uddin
3f52272883
Merge "Migrate system/core/adb to packages/modules/adb"
2020-10-23 16:16:32 +00:00
Baligh Uddin
c94a47023b
[automerger skipped] Merge "Migrate system/core/adb to packages/modules/adb" into rvc-d1-dev-plus-aosp am: 1aa49c1029 -s ours
...
am skip reason: Change-Id Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d with SHA-1 6483df6f1d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12890823
Change-Id: If619f3694f38364876a3c1974fcc6672a4d22163
2020-10-23 12:49:57 +00:00
Baligh Uddin
1aa49c1029
Merge "Migrate system/core/adb to packages/modules/adb" into rvc-d1-dev-plus-aosp
2020-10-23 12:37:41 +00:00
Daniel Rosenberg
5003a5e2ea
Merge changes I3339d552,I126e1583,Iccc6580a am: 323060840a am: 37ee1dc4ac am: 32fd86148d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465344
Change-Id: I269cfb1687f4161bf07b7fa75649883cad1b439c
2020-10-23 11:51:46 +00:00
Daniel Rosenberg
32fd86148d
Merge changes I3339d552,I126e1583,Iccc6580a am: 323060840a am: 37ee1dc4ac
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465344
Change-Id: Id6b3393f1335e00ebf9d6c3700fe1f60056fc799
2020-10-23 11:35:41 +00:00
Daniel Rosenberg
37ee1dc4ac
Merge changes I3339d552,I126e1583,Iccc6580a am: 323060840a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465344
Change-Id: I2403b284a5635943244f5bdda9f7b9c8a2b1d0b1
2020-10-23 11:18:38 +00:00
Daniel Rosenberg
323060840a
Merge changes I3339d552,I126e1583,Iccc6580a
...
* changes:
Add GetLastLabel and InitializeAppend
Switch up Cow Format to be resumable
reland: Rename Flush to Finalize
2020-10-23 11:08:46 +00:00
Yongqin Liu
c007c43335
fs_mgr.cpp: fix the problem that the casefold feature not enabled for the data partition
...
The value of entry.mount_point for data partition is "/data"
Fixes: 5ba5b90cd6 ("fs_mgr: try tune2fs for casefolding on /data only")
Test: got "Can't mount with encoding and encryption" problem reported
by the db845c build with the default 5.4.38 prebuilt kernel
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I226a2275f5f2ee18503c5a3863ef5a1d2c2ed7be
2020-10-23 13:34:49 +08:00
David Anderson
fe7585a8b0
snapuserd: Refactor client to allow persistent connections.
...
This refactors SnapuserdClient so it retains a connection for its
lifetime. This allows SnapshotManager to ensure the daemon is running
and hold a connection open across all of its operations.
The main impetus of this change is to remove the ambiguity between first
and second-stage sockets. SnapshotManager should only ever connect to
the first-stage socket during first-stage init, or, to initiate the
"transition" step during second-stage init.
The transition steps are roughly:
(1) Start second-stage daemon.
(2) Load new device-mapper tables.
(3) Connect second-stage daemon to new dm-user devices.
(4) Activate the new tables, flushing IO to the first-stage daemon.
(5) Send a signal to the first-stage daemon to exit.
This patch makes it easier to hold these two separate connections.
Bug: 168554689
Test: manual test
Change-Id: I51cb9adecffb19143ed685e0c33456177ec3d81f
2020-10-22 22:07:23 -07:00
David Anderson
cff35f67ad
snapuserd: Refactor daemon/server.
...
This is in preparation for moving to a traditional client/server model
where clients stay connected and the server multiplexes multiple
connections.
Client has been renamed to DmUserClient to differentiate it from local
socket clients.
poll() responsibilities have been moved into SnapuserdServer. In
addition, the server now tracks all open clients and polls them
together with the listen socket.
SnapuserDaemon is now only responsible for signal masking. These two
classes can probably be merged together - I didn't do that here because
the patch was already large.
Bug: 168554689
Test: manual test
Change-Id: Ibc06f6287d49e832a8e25dd936ec07747a1b0555
2020-10-22 22:00:17 -07:00
Daniel Rosenberg
3d17cb9a57
Add GetLastLabel and InitializeAppend
...
GetLastLabel returns the last Label that a reader is confident about.
InitializeAppend starts a writer up to append data after the last given
label, assuming all later labels are not relevant data.
Change-Id: I3339d5527bae833d9293cbbc63126136b94bd976
Bug: 168829493
Test: cow_api_test
2020-10-22 21:26:27 -07:00
Daniel Rosenberg
2d2fd72502
Switch up Cow Format to be resumable
...
This switches up the format to alternate ops with data, followed by a
footer containing additional meta information. This allows the file to
be resumed at arbitrary points if writing gets interrupted by power
loss.
Also adds a label op, which allows labeling future ops as connected.
If the footer is missing, Append will treat the last label as possibly
corrupt, and ignore it.
Change-Id: I126e15837d710776f9396e7afc9b0cd595e26b59
Bug: 168829493
Test: cow_api_test
2020-10-22 21:26:27 -07:00
Baligh Uddin
795c2c222c
Migrate system/core/adb to packages/modules/adb
...
BUG: 167963357
Test: TH
Merged-In: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
Change-Id: I810a109116247af2af9a8628680620cb683d48a9
2020-10-23 03:43:43 +00:00
Baligh Uddin
6483df6f1d
Migrate system/core/adb to packages/modules/adb
...
BUG: 167963357
Test: TH
Merged-In: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
Change-Id: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
2020-10-22 23:07:41 +00:00
David Anderson
0aa021b410
Merge "libsnapshot: Add .rc file for snapuserd." am: 7d55df2895 am: e3c278a20a am: f9d47928f9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468412
Change-Id: I54db8075a2fe9fe0ffd35658554bfa45aebcb160
2020-10-22 22:24:52 +00:00
Baligh Uddin
efe701798b
Migrate system/core/adb to packages/modules/adb
...
BUG: 167963357
Test: TH
Merged-In: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
Change-Id: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
2020-10-22 22:23:17 +00:00
David Anderson
f9d47928f9
Merge "libsnapshot: Add .rc file for snapuserd." am: 7d55df2895 am: e3c278a20a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468412
Change-Id: Ie14d19429eb060a3721fc40d56f59c027e5432f4
2020-10-22 21:55:44 +00:00
David Anderson
e3c278a20a
Merge "libsnapshot: Add .rc file for snapuserd." am: 7d55df2895
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468412
Change-Id: Ifdbbb5af374b60d8d279624cfcd2b6185a7d4571
2020-10-22 21:04:45 +00:00
David Anderson
7d55df2895
Merge "libsnapshot: Add .rc file for snapuserd."
2020-10-22 18:21:18 +00:00
Primiano Tucci
253289fe07
Introduce security.lower_kptr_restrict property
...
This is to allow the tracing service to temporarily
lower kptr_restrict for the time it takes to build
its internal symbolization map (~200ms), only on
userdebug/eng builds.
kptr_restrict unfortunately cannot be lowered by
the tracing service itself. The main reason for that
is the fact that the kernel enforces a CAP_SYS_ADMIN
capability check at write() time, so the usual pattern
of opening the file in init and passing the FD to the
service won't work.
For more details see the design doc go/perfetto-kallsyms.
Bug: 136133013
Test: perfetto_integrationtests --gtest_filter=PerfettoTest.KernelAddressSymbolization in r.android.com/1454882
Change-Id: Ib2a8c69ed5348cc436223ff5e3eb8fd8df4ab860
2020-10-22 16:18:41 +01:00
Daniel Rosenberg
b4a81ccd5a
reland: Rename Flush to Finalize
...
As we change to a more resumable format, flush mostly writes the final
parts of the file that are needed, which would write extra data that is
not needed to continue writing, and would immediately be overwritten.
Additionally, in the next patch we will fsync the file after adding an
op, making the flush built in, and the Finalize name more appropriate.
Bug: 168829493
Test: builds
Change-Id: Iccc6580ac72ff066cfeeb32e3cdaf69c5ba615fc
2020-10-22 02:34:26 -07:00
Treehugger Robot
6fa226f9e4
Merge "Use the "marketing names" for Q and R." am: 1ef094a890 am: d7fb304da9 am: 7b53c43408
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1470050
Change-Id: I24214a8d10796432df37791dbf43fc5a9424725d
2020-10-22 08:00:50 +00:00
Christopher Ferris
806a5c1de6
Merge "Update for new kernel headers." am: 758e52551f am: 988995e6e1 am: 625e741561
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466035
Change-Id: I3cddf1e84b352425d3c0a52f408aa48bbcdfea08
2020-10-22 07:53:53 +00:00