diff options
| author | Nikhil V <quic_nprakash@quicinc.com> | 2023-09-11 11:34:34 +0530 |
|---|---|---|
| committer | Nikhil V <quic_nprakash@quicinc.com> | 2024-04-22 11:05:17 +0530 |
| commit | 503add1843888822f114019f2cf0e84ec936ae4f (patch) | |
| tree | 38c2b9c88f44501d39d4cea64a6c29fbc24abe76 | |
| parent | 3e99ae28ea8fc07e22535581e23dc3370845cdfb (diff) | |
| download | hikey-linaro-503add1843888822f114019f2cf0e84ec936ae4f.tar.gz | |
ANDROID: PM: hibernate: Encryption support with compression
Currently only the uncompressed hibernation snapshot image is encrypted
before being written to the swap partition. Extend the encryption
support for compression enabled scenarios as well.
Bug: 335581841
Change-Id: Ida781b727f56b664a67e2887a4db3d6b355dafdb
Signed-off-by: Nikhil V <quic_nprakash@quicinc.com>
| -rw-r--r-- | kernel/power/swap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index f4f7f8d03cd4..1e7f41c09a7e 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -596,7 +596,6 @@ static int save_image(struct swap_map_handle *handle, if (!ret) pr_info("Image saving done\n"); swsusp_show_speed(start, stop, nr_to_write, "Wrote"); - trace_android_vh_post_image_save(root_swap); return ret; } @@ -879,6 +878,7 @@ static int save_compressed_image(struct swap_map_handle *handle, off += PAGE_SIZE) { memcpy(page, data[thr].cmp + off, PAGE_SIZE); + trace_android_vh_encrypt_page(page); ret = swap_write_page(handle, page, &hb); if (ret) goto out_finish; @@ -997,6 +997,9 @@ int swsusp_write(unsigned int flags) error = (flags & SF_NOCOMPRESS_MODE) ? save_image(&handle, &snapshot, pages - 1) : save_compressed_image(&handle, &snapshot, pages - 1); + + if (!error) + trace_android_vh_post_image_save(root_swap); } out_finish: error = swap_writer_finish(&handle, flags, error); |