wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,266 Commits 2 Branches 0 Tags 2.3 MiB
Commit Graph

1266 Commits

Author SHA1 Message Date
Bill Yi f46664eb4e [automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: af5221c0aa -s ours am: bb644e429d -s ours am: 414187f3e7 -s ours am: 939a5bea0b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1763588

Change-Id: Iaa5097cf474f1603e90d0b47921fba55beba35d3
 2021-07-13 01:57:05 +00:00
Bill Yi 939a5bea0b [automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: af5221c0aa -s ours am: bb644e429d -s ours am: 414187f3e7 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1763588

Change-Id: I2db16bf6ac282380807df923a7ed3789ccb5d9a1
 2021-07-13 01:39:27 +00:00
Bill Yi 414187f3e7 [automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: af5221c0aa -s ours am: bb644e429d -s ours 
am skip reason: Merged-In Ie5a50c392ef5124a0c2390c8d4f902808d672739 with SHA-1 4571e22641 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1763588

Change-Id: I2115de4b4c22260f0b89ef6fc65a5855a4d22889
 2021-07-13 01:21:32 +00:00
Bill Yi bb644e429d [automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: af5221c0aa -s ours 
am skip reason: Merged-In Ie5a50c392ef5124a0c2390c8d4f902808d672739 with SHA-1 4571e22641 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1763588

Change-Id: Ie6aa987914131dc840a522707f0492e88e2dfc1c
 2021-07-13 01:02:57 +00:00
Bill Yi af5221c0aa Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 
Merged-In: Ie5a50c392ef5124a0c2390c8d4f902808d672739
Merged-In: I89b3edde09dfcf35b8214fecbed18ce5092701cc
Merged-In: I89b3edde09dfcf35b8214fecbed18ce5092701cc
Change-Id: I25eccb8109695125480f0da0e136ab98dabfaa0d
 2021-07-12 11:08:30 -07:00
Bill Yi 3b20cc2955 [automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 3e0118d834 -s ours am: f3a348d82f -s ours am: 15db595ab3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15257338

Change-Id: Ica395c4270e048f4b88b63b5c20af8b761ba1cc1
 2021-07-12 13:56:27 +00:00
Bill Yi 15db595ab3 [automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 3e0118d834 -s ours am: f3a348d82f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15257338

Change-Id: Ia063904dfa368a211476241a1d4de79a129ef99f
 2021-07-12 13:42:05 +00:00
Bill Yi f3a348d82f [automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 3e0118d834 -s ours 
am skip reason: Merged-In I19b3c21e31e1ea4750e3e185474e82d0ed04f9a7 with SHA-1 ba6f7e4a74 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15257338

Change-Id: I5e671dd7acafbc61af958240b1109c8c354f17ed
 2021-07-12 13:27:13 +00:00
Bill Yi 3e0118d834 Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE 
Merged-In: I89b3edde09dfcf35b8214fecbed18ce5092701cc
Merged-In: I19b3c21e31e1ea4750e3e185474e82d0ed04f9a7
Change-Id: I9234fbd1f3434582615e56f662b76aa67a506d7d
 2021-07-11 22:43:43 -07:00
Xin Li bb7e1a4167 [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 4571e22641 -s ours am: ba6f7e4a74 -s ours am: c6f564a772 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15024056

Change-Id: I6384b6deb7e52242a4ac7f442e81552687b5e5de
 2021-06-18 06:51:55 +00:00
Xin Li c6f564a772 [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 4571e22641 -s ours am: ba6f7e4a74 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15024056

Change-Id: Ie757cbb82b61ab5b46b260ae7cd643e9ecadf3d2
 2021-06-18 06:34:32 +00:00
Xin Li ba6f7e4a74 [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 4571e22641 -s ours 
am skip reason: Merged-In Ibd98f113f81a4f699b11dbc843a95ee2e2197c92 with SHA-1 e0d6203d39 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/15024056

Change-Id: I19b3c21e31e1ea4750e3e185474e82d0ed04f9a7
 2021-06-18 06:19:00 +00:00
Xin Li 4571e22641 DO NOT MERGE - Mark RQ3A.210410.001 as merged 
Bug: 190855093
Merged-In: Ibd98f113f81a4f699b11dbc843a95ee2e2197c92
Change-Id: Ie5a50c392ef5124a0c2390c8d4f902808d672739
 2021-06-17 22:43:30 -07:00
Suren Baghdasaryan 49c4c253e5 [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 am: 864309e1ce -s ours am: e8b60c67bf -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 a01f251ff2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: I37c6389050909ed12250b4114446ba4c23d348cb
 2021-06-16 21:07:47 +00:00
Suren Baghdasaryan aeb6c5e7c4 [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 -s ours am: 0e61541dfe -s ours am: 8128b659d8 -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 a01f251ff2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: Idac5d2828aa6e7b3c8f4b411d6717e21d8ffe643
 2021-06-16 21:07:35 +00:00
Suren Baghdasaryan e8b60c67bf [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 am: 864309e1ce -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 a01f251ff2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: I50c27f4d6131dd5a0640ffdc6a605ed0e05f2365
 2021-06-16 20:57:44 +00:00
Suren Baghdasaryan 8128b659d8 [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 -s ours am: 0e61541dfe -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 940e7cf8bd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: Ifcbe92abb84a97aa3ad51e4b528c05bda03e15c6
 2021-06-16 20:53:13 +00:00
Suren Baghdasaryan f68158265e [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 am: cce3ea4a7f -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 940e7cf8bd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: I0e7ecbddd8bbe1d739778dc87e6adb9b065ed076
 2021-06-16 20:52:08 +00:00
Suren Baghdasaryan 864309e1ce lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: I8d23c47da384439b6dfe0bbc55009be8ef5c4501
 2021-06-16 20:43:03 +00:00
Suren Baghdasaryan 0e61541dfe [automerger skipped] lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 -s ours 
am skip reason: Merged-In Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5 with SHA-1 940e7cf8bd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: Ib66f41abf2b9057b66fc26c07fe33fa5567a9cd3
 2021-06-16 20:42:47 +00:00
Suren Baghdasaryan cce3ea4a7f lmkd: Include total GPU memory usage in killinfo reports am: a01f251ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14985915

Change-Id: I657ebfff0b709473e2c843670768c4eff4b92742
 2021-06-16 20:42:30 +00:00
Suren Baghdasaryan a01f251ff2 lmkd: Include total GPU memory usage in killinfo reports 
/sys/fs/bpf/map_gpu_mem_gpu_mem_total_map BPF map exposes total GPU
allocations size. Include this value into killinfo reports to track GPU
allocation size at the time of the kill.

Bug: 189366037
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5
Merged-In: Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5
 2021-06-16 15:53:07 +00:00
Suren Baghdasaryan 1a1e76bed0 Merge "lmkd: Include total GPU memory usage in killinfo reports" am: cde0acde94 am: e0d6203d39 am: 740eb4cb91 am: 97fb31c8f7 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1721873

Change-Id: Ibd4a2267ed6ee7ce3d10b6b16b26912cbd037bb4
 2021-06-15 02:36:46 +00:00
Suren Baghdasaryan 97fb31c8f7 Merge "lmkd: Include total GPU memory usage in killinfo reports" am: cde0acde94 am: e0d6203d39 am: 740eb4cb91 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1721873

Change-Id: Ica28e8907c4d9907eaa4cd12c32549a8540939d0
 2021-06-15 02:17:28 +00:00
Suren Baghdasaryan 740eb4cb91 Merge "lmkd: Include total GPU memory usage in killinfo reports" am: cde0acde94 am: e0d6203d39 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1721873

Change-Id: I0598e65644067a04f5068d374c98dd5482571c79
 2021-06-15 02:02:44 +00:00
Suren Baghdasaryan e0d6203d39 Merge "lmkd: Include total GPU memory usage in killinfo reports" am: cde0acde94 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1721873

Change-Id: Ibd98f113f81a4f699b11dbc843a95ee2e2197c92
 2021-06-15 01:49:40 +00:00
Suren Baghdasaryan cde0acde94 Merge "lmkd: Include total GPU memory usage in killinfo reports" 2021-06-15 01:33:14 +00:00
Xin Li 7698be7dee [automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3 am: 61e2948e80 -s ours am: c55de10437 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156

Change-Id: I33a0a4cfaf369cb5c0473acab31bf16ca22177ca
 2021-06-13 23:55:55 +00:00
Xin Li c55de10437 [automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3 am: 61e2948e80 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156

Change-Id: I06cfb3f1359cb7774325beb03e90e5c2c5796356
 2021-06-13 23:47:51 +00:00
Xin Li 61e2948e80 DO NOT MERGE - Merge ab/7272582 am: b494068d81 am: 7b42292af3 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156

Change-Id: I4b76aa439db36731a599125341100d9f81f0fdb4
 2021-06-13 23:30:38 +00:00
Xin Li 7b42292af3 DO NOT MERGE - Merge ab/7272582 am: b494068d81 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1736156

Change-Id: I94c864786f2d51e5f265921fa1a332ba6443a9ac
 2021-06-13 23:13:21 +00:00
Xin Li b494068d81 DO NOT MERGE - Merge ab/7272582 
Bug: 190855093
Change-Id: I42de6c44d675f5acc076df33083f8fe87da7031a
 2021-06-11 17:33:57 -07:00
Suren Baghdasaryan 940e7cf8bd lmkd: Include total GPU memory usage in killinfo reports 
/sys/fs/bpf/map_gpu_mem_gpu_mem_total_map BPF map exposes total GPU
allocations size. Include this value into killinfo reports to track GPU
allocation size at the time of the kill.

Bug: 189366037
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Icc1ed8ab2593530fa293ff9c82f6c8dc400485f5
 2021-06-03 15:56:52 -07:00
Xin Li 621c9bee5f Merge sc-mainline-prod 
Bug: 189946434
Change-Id: Icbd2498a6d46d9f8d47e000025a546336f4e96ba
 2021-06-02 16:53:00 +00:00
android-build-team Robot 1ff19f401f Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release 
Change-Id: I559773c77635b6480d054ba0daba281eef4f84a5
 2021-05-20 00:04:50 +00:00
Suren Baghdasaryan ffce101d86 lmkd: Handle cases when proc_get_name() might return NULL 
proc_get_name() can return NULL if the corresponding process has died
or open fails with ENOMEM due to memory shortages.
Ensure such cases are handled without NULL pointer access.

Bug: 186157675
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I05b288e3808bec0bdb73db32de02ba3a322ca6e1
(cherry picked from commit e5995b8269)
 2021-05-20 00:02:07 +00:00
Suren Baghdasaryan 4b85b5c5fd lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: 3eaa6dbd6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: Ic9fa32b94b395a193eafd61ad2fce3c989b3dce8
 2021-05-19 11:14:00 +00:00
Vova Sharaienko 82d2c16f99 [automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours am: 482300d472 -s ours 
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386

Change-Id: Ia54564df92face76056b59263438c497c94a1d3c
 2021-05-19 10:55:30 +00:00
Vova Sharaienko a7e8c3f765 lmkd: reroute atoms logging to AMS am: 6f11aff418 am: 45fa6a05cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337

Change-Id: I368b761665596af5aac38b9c3818a2115ca7698e
 2021-05-19 10:24:03 +00:00
Suren Baghdasaryan e203067700 lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001 am: 1174827c4d 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656

Change-Id: If728cc5a0edf03d0406adaad0c0a719d1b07b0d9
 2021-05-19 09:27:24 +00:00
Suren Baghdasaryan fd5a6f4ff0 lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: a6152b9a07 am: 6426247116 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: I692ef0d835902c4d8c4e7110413b398ceede3333
 2021-05-18 19:30:47 +00:00
Vova Sharaienko fd293a6f84 [automerger skipped] lmkd: reroute atoms logging to AMS am: a92b76b54d am: ea85216d08 am: 94be9d6516 -s ours am: 4e810afb15 -s ours am: f96602bb3b -s ours am: 1779e3b776 -s ours 
am skip reason: Merged-In Id682a438c87b3e4503261d26461f6cee641d86c4 with SHA-1 6f11aff418 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1702386

Change-Id: I4e0bed296d62f8ee549fef6fbc866c7a1220dedc
 2021-05-18 11:38:43 +00:00
Vova Sharaienko 8496d7f7c1 lmkd: reroute atoms logging to AMS am: 6f11aff418 am: 56a9b111e6 am: 35804ede5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14313337

Change-Id: Id4b21bbcc1029ab9c5b2b7ff83d660dd02977452
 2021-05-18 10:33:23 +00:00
Suren Baghdasaryan a759007e7d lmkd: Do not treat RSS=0 as a sign of a process being dead am: 5263aa7800 am: 8aec07bbe0 am: 28164d3cc6 am: 918648b001 am: a8c2e1ece9 am: 4de47eb096 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1690656

Change-Id: I18119ddbc22480c7a5e0e57642896706e8a15b49
 2021-05-17 10:30:02 +00:00
Suren Baghdasaryan f32c144de7 lmkd: Handle cases when proc_get_name() might return NULL am: 9f1be12b9a am: d7838b8e06 am: c30dd665ba am: e67d7be9e4 am: d9cae1e040 
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1685347

Change-Id: Ic1d3a3b5363a532f6fcb6f051d5f9c285b2b4bc4
 2021-05-17 09:40:38 +00:00
Suren Baghdasaryan 6426247116 lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 am: a6152b9a07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: Iaaa041661a16c0f8ae8fb411309ec05f5f0c98d6
 2021-05-14 23:52:30 +00:00
Suren Baghdasaryan a6152b9a07 lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: Id8a7eb3d56e281de8e55c48f51c9cf65529685b0
 2021-05-14 23:13:09 +00:00
Suren Baghdasaryan 13876bb9ad lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: I69fa090c4c0da7fc5ae231aae2a96693ef4348fa
 2021-05-14 23:11:24 +00:00
Suren Baghdasaryan 3eaa6dbd6b lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec am: 449e1017e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: Ieb50968b6823cafa09ab8524bfebd5d15716bc9b
 2021-05-14 23:11:04 +00:00
Suren Baghdasaryan 449e1017e1 lmkd: Handle cases when proc_get_name() might return NULL am: e5995b8269 am: b928e5d6ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/14297833

Change-Id: Id82515f2cfe0e98d8dd6ad419c2544941642404a
 2021-05-14 22:49:07 +00:00