Commit graph

47772 commits

Author SHA1 Message Date
Cody Schuffelen
6dbf6a491c Merge "Add native vsock support to ADB." am: d290bb7ed8 am: 8435ddc499
am: 00a8d2693f

Change-Id: I5fc12d468a710dcca271ba1f03b6a939675b1cb2
2019-01-25 21:45:32 -08:00
Cody Schuffelen
00a8d2693f Merge "Add native vsock support to ADB." am: d290bb7ed8
am: 8435ddc499

Change-Id: Id4ea2bc3f4a9f91c190973967237c65daba1eff0
2019-01-25 21:41:26 -08:00
Cody Schuffelen
8435ddc499 Merge "Add native vsock support to ADB."
am: d290bb7ed8

Change-Id: I6acb0811ad5c1fb7ed521c59450d8a838a92faf3
2019-01-25 21:37:15 -08:00
Treehugger Robot
d290bb7ed8 Merge "Add native vsock support to ADB." 2019-01-26 05:25:28 +00:00
Wei Wang
6379e920be Merge "Fix path for default prop" am: 3c2c9d8d43 am: 9155524429
am: e1c2e0d283

Change-Id: I467ca7aa10a9546d759f4232b56ef7eae1228f6f
2019-01-25 20:45:21 -08:00
Wei Wang
e1c2e0d283 Merge "Fix path for default prop" am: 3c2c9d8d43
am: 9155524429

Change-Id: I85069417ceb4de45f88d49f2d6f3b4511e741746
2019-01-25 20:41:07 -08:00
Wei Wang
9155524429 Merge "Fix path for default prop"
am: 3c2c9d8d43

Change-Id: I9ceb4b7a02fcfd869aab0c28545bfb9d31ebb683
2019-01-25 20:36:57 -08:00
Treehugger Robot
3c2c9d8d43 Merge "Fix path for default prop" 2019-01-26 04:22:37 +00:00
Mark Salyzyn
b2ea2f23f3 Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging" am: 33cff00c1c am: 7cc3afb98c
am: c685a375dc

Change-Id: I9778917bdacd47be3ab9db9329bf8e895869204b
2019-01-25 20:12:06 -08:00
Mark Salyzyn
c685a375dc Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging" am: 33cff00c1c
am: 7cc3afb98c

Change-Id: I7b9c1aa52e183c7ed385b79f287bbfad82f15707
2019-01-25 20:07:56 -08:00
Mark Salyzyn
7cc3afb98c Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging"
am: 33cff00c1c

Change-Id: Ia141090dee34971c219be0e57a228a03e20001af
2019-01-25 19:55:20 -08:00
Treehugger Robot
33cff00c1c Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging" 2019-01-26 03:47:49 +00:00
Cody Schuffelen
a05b64d432 Add native vsock support to ADB.
vsock is a socket address family for communicating into and out of
virtual machines. Addresses have a port and CID. The CID is unique to
each virtual machine on the computer. The VM host always has CID 2.
http://man7.org/linux/man-pages/man7/vsock.7.html

Inside the android guest, the adb daemon hosts a vsock server with
VMADDR_CID_ANY, automatically using the guest CID. The adb server
can now connect to addresses of the form vsock:cid:port, where the CID
must be specified and the port defaults to 5555.

This is a significant speed improvement for ADB connections in
Cuttlefish, with 150-200 MB/s for `adb push` and 100-150 MB/s for
`adb pull`. It also allows removing some proxying steps from Cuttlefish,
simplifying the full connection path, and removes a dependency on the
unstable ivshmem protocol.

Commands tested against a Cuttlefish VM with CID 3:
adb connect vsock:3:5555
adb -s vsock:3:5555 shell
adb disconnect vsock:3:5555

Supporting "adb disconnect" and "adb -s" required modifying some of the
parts that parse addresses / serials.

push/pull trials with native adb vsock support in cuttlefish:

100m: 1 file pushed. 297.6 MB/s (104857600 bytes in 0.336s)
100m: 1 file pushed. 270.3 MB/s (104857600 bytes in 0.370s)
100m: 1 file pushed. 271.7 MB/s (104857600 bytes in 0.368s)
100m: 1 file pushed. 250.5 MB/s (104857600 bytes in 0.399s)
100m: 1 file pushed. 277.1 MB/s (104857600 bytes in 0.361s)
100m: 1 file pushed. 263.5 MB/s (104857600 bytes in 0.379s)
100m: 1 file pushed. 242.6 MB/s (104857600 bytes in 0.412s)
100m: 1 file pushed. 271.8 MB/s (104857600 bytes in 0.368s)
100m: 1 file pushed. 267.1 MB/s (104857600 bytes in 0.374s)

/data/local/tmp/100m: 1 file pulled. 212.8 MB/s (104857600 bytes in 0.470s)
/data/local/tmp/100m: 1 file pulled. 236.7 MB/s (104857600 bytes in 0.423s)
/data/local/tmp/100m: 1 file pulled. 201.2 MB/s (104857600 bytes in 0.497s)
/data/local/tmp/100m: 1 file pulled. 255.6 MB/s (104857600 bytes in 0.391s)
/data/local/tmp/100m: 1 file pulled. 199.6 MB/s (104857600 bytes in 0.501s)
/data/local/tmp/100m: 1 file pulled. 214.6 MB/s (104857600 bytes in 0.466s)
/data/local/tmp/100m: 1 file pulled. 254.2 MB/s (104857600 bytes in 0.393s)
/data/local/tmp/100m: 1 file pulled. 212.5 MB/s (104857600 bytes in 0.471s)
/data/local/tmp/100m: 1 file pulled. 218.9 MB/s (104857600 bytes in 0.457s)
/data/local/tmp/100m: 1 file pulled. 223.6 MB/s (104857600 bytes in 0.447s)

Bug: 121166534
Change-Id: I50f21fb5c9acafb8daa789df4e28c9e1bbbbf2ef
Test: adb connect/shell/disconnect
2019-01-25 17:55:06 -08:00
Josh Gao
6bbd3ff7ff Merge "adb: convert more stuff to unique_fd." am: 79f60a9bab am: 7dcb91cbc8
am: 60df9ecb5e

Change-Id: I5fdd7ad01021fe0670bfb58b83bc6f42e97768f2
2019-01-25 14:12:10 -08:00
Dongwon Kang
61f1908142 Merge "Add mediametrics to ld.config.legacy.txt" am: 9819ade714 am: 1d80f81bd3
am: 22bfd8727c

Change-Id: I889f80ed5c9efb4e47cf2492f192b0f64df2223a
2019-01-25 14:10:43 -08:00
Josh Gao
60df9ecb5e Merge "adb: convert more stuff to unique_fd." am: 79f60a9bab
am: 7dcb91cbc8

Change-Id: Ic69dcb4d1c499dc8e4daffb13435f5f22dd1e030
2019-01-25 14:03:18 -08:00
Dongwon Kang
22bfd8727c Merge "Add mediametrics to ld.config.legacy.txt" am: 9819ade714
am: 1d80f81bd3

Change-Id: Ied4e694a50c00828c930a8ad4ffe4a0db1d12a77
2019-01-25 14:02:06 -08:00
Josh Gao
7dcb91cbc8 Merge "adb: convert more stuff to unique_fd."
am: 79f60a9bab

Change-Id: I3633efe24d2b337adca2ad39347faa7d1772a100
2019-01-25 13:56:15 -08:00
Dongwon Kang
1d80f81bd3 Merge "Add mediametrics to ld.config.legacy.txt"
am: 9819ade714

Change-Id: Id3d8f5b8e51ffa78cdf0b8898869ad5642aa343a
2019-01-25 13:52:58 -08:00
Josh Gao
79f60a9bab Merge "adb: convert more stuff to unique_fd." 2019-01-25 21:48:28 +00:00
Dongwon Kang
9819ade714 Merge "Add mediametrics to ld.config.legacy.txt" 2019-01-25 21:40:33 +00:00
David Anderson
ae8863c9b9 Merge "init: Format userdata_gsi if needed." am: 212693c7ae am: bde4a82213
am: dac57223ef

Change-Id: Ib5d5aef8a426f59b698723c70edf776b8c535fcf
2019-01-25 12:59:02 -08:00
David Anderson
dac57223ef Merge "init: Format userdata_gsi if needed." am: 212693c7ae
am: bde4a82213

Change-Id: Ifc3e631250c5ad8a24b5a1d2708d38f41126e8c6
2019-01-25 12:53:50 -08:00
David Anderson
bde4a82213 Merge "init: Format userdata_gsi if needed."
am: 212693c7ae

Change-Id: Ia12d9de29dc59fd34c69d16579b7461128e4be34
2019-01-25 12:48:40 -08:00
David Anderson
212693c7ae Merge "init: Format userdata_gsi if needed." 2019-01-25 20:39:49 +00:00
Neil Fuller
21c7e44754 Merge "Move APEX symlink creation to alternative module" am: e41489a9a1 am: 76ff6282e8
am: 8dd123cda9

Change-Id: I1728fe8f5688b4e60509b2ee7ede73bac11e4889
2019-01-25 11:09:36 -08:00
Neil Fuller
8dd123cda9 Merge "Move APEX symlink creation to alternative module" am: e41489a9a1
am: 76ff6282e8

Change-Id: Ib39161f6690cf7ca914396eb06bb70ad5cce464f
2019-01-25 11:03:46 -08:00
Neil Fuller
76ff6282e8 Merge "Move APEX symlink creation to alternative module"
am: e41489a9a1

Change-Id: I6ad89667367f10999e0ed313303c4c5e53e5b78a
2019-01-25 10:57:39 -08:00
Sasha Smundak
e131a4f32d Merge "Convert Android.mk file to Android.bp" am: 4830ba0fd1 am: b564e24363
am: 240b4ab04a

Change-Id: Ibe31f8b654ca7120639e21b8363b12baafd2e7a7
2019-01-25 10:50:08 -08:00
Tri Vo
a5bf98bf50 Merge "Read selinux_denial_metadata from /vendor" am: 6600f978a4 am: 71fce27629
am: 338d78b7bd

Change-Id: Ie977be72a2f10beb7f4162a3f66d20bdd37c2c03
2019-01-25 10:43:25 -08:00
Neil Fuller
e41489a9a1 Merge "Move APEX symlink creation to alternative module" 2019-01-25 18:42:12 +00:00
Tom Cherry
d6f4b9d728 Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING" am: afa0d88eea am: bf2ea0fab7
am: ddcc5bf05e

Change-Id: I1aaee10ef2fc1d0880571315151c34af8b12fc10
2019-01-25 10:37:48 -08:00
Sasha Smundak
240b4ab04a Merge "Convert Android.mk file to Android.bp" am: 4830ba0fd1
am: b564e24363

Change-Id: Ic9b7203ae12e2adba3cadc699d408d9002d791c5
2019-01-25 10:34:35 -08:00
Wei Wang
0d78bfbc09 Fix path for default prop
Bug: 123407630
Test: boot
Change-Id: Ia10ac6ad141e980abb07d7b37487f9de9ef64796
2019-01-25 10:30:47 -08:00
Sasha Smundak
b564e24363 Merge "Convert Android.mk file to Android.bp"
am: 4830ba0fd1

Change-Id: Ia2f59033a20d001bb8237f6ccd0fb3ac57f36e1e
2019-01-25 10:29:12 -08:00
Treehugger Robot
4830ba0fd1 Merge "Convert Android.mk file to Android.bp" 2019-01-25 18:17:54 +00:00
Tri Vo
338d78b7bd Merge "Read selinux_denial_metadata from /vendor" am: 6600f978a4
am: 71fce27629

Change-Id: Iba119ab8619049ea9d63e052f785393dc1383e4a
2019-01-25 10:15:11 -08:00
Tom Cherry
ddcc5bf05e Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING" am: afa0d88eea
am: bf2ea0fab7

Change-Id: Id0f8eaca9877201b9c132cede97c2a7afba13468
2019-01-25 10:12:55 -08:00
Tri Vo
71fce27629 Merge "Read selinux_denial_metadata from /vendor"
am: 6600f978a4

Change-Id: I7e67380198857ac24956d7ae2686e16dfe3d4d61
2019-01-25 10:02:26 -08:00
Tri Vo
6600f978a4 Merge "Read selinux_denial_metadata from /vendor" 2019-01-25 17:51:48 +00:00
Suren Baghdasaryan
2e2b4adb5d Merge changes from topic "re-revert move sched_policy functions" am: 1bcb634958 am: 1b40fa6bda
am: 6433963568

Change-Id: Ia07c5f9fec24936c134ef818843a1150338e7fe4
2019-01-25 09:50:16 -08:00
Tom Cherry
bf2ea0fab7 Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING"
am: afa0d88eea

Change-Id: I5ee153fae1ec35c3ee25cee9185f03865e5ffbe7
2019-01-25 09:47:53 -08:00
Suren Baghdasaryan
6433963568 Merge changes from topic "re-revert move sched_policy functions" am: 1bcb634958
am: 1b40fa6bda

Change-Id: If121f3081afa10bdf6dc436f838769d4f23aa013
2019-01-25 09:43:33 -08:00
Suren Baghdasaryan
5a8e717dd3 [automerger skipped] DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users"" am: 9491078300 -s ours am: 7f758a81e4 -s ours
am: 8f6481d8cd -s ours
am skip reason: subject contains skip directive

Change-Id: I7f5e7d4e2972ef5febb76216da49e65175e5f1ea
2019-01-25 09:39:35 -08:00
Elliott Hughes
0c95719f7f Merge "Remove dead code." am: cdd0aaa3ae am: 186d539b36
am: 269b78b989

Change-Id: I859380658209ecd9de720bbc747bd047958e8922
2019-01-25 09:30:32 -08:00
Suren Baghdasaryan
8f6481d8cd [automerger skipped] DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users"" am: 9491078300 -s ours
am: 7f758a81e4 -s ours
am skip reason: subject contains skip directive

Change-Id: Icc1aed0aab4a45e674c56083648bdb348c73db3e
2019-01-25 09:27:31 -08:00
Suren Baghdasaryan
1b40fa6bda Merge changes from topic "re-revert move sched_policy functions"
am: 1bcb634958

Change-Id: I82fc5590deaec7878bd87bb338544b72299b89fc
2019-01-25 09:26:39 -08:00
Elliott Hughes
269b78b989 Merge "Remove dead code." am: cdd0aaa3ae
am: 186d539b36

Change-Id: I1e5218d0b1e5a78b25d851da3b76b5cadef29df1
2019-01-25 09:26:23 -08:00
Dongwon Kang
0095e35fdd Add mediametrics to ld.config.legacy.txt
Test: TH
Bug: 119675363
Change-Id: Ic2fa2cf1931b40f0f476e8be797aa0db9a2582b7
2019-01-25 09:26:17 -08:00
Tom Cherry
afa0d88eea Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING" 2019-01-25 17:25:58 +00:00