Skip to content

Commit 62b9ca1

Browse files
superm1rafaeljw
authored andcommitted
PM: hibernate: Emit an error when image writing fails
If image writing fails, a return code is passed up to the caller, but none of the callers log anything to the log and so the only record of it is the return code that userspace gets. Adjust the logging so that the image size and speed of writing is only emitted on success and if there is an error, it's saved to the logs. Fixes: a06c6f5 ("PM: hibernate: Move to crypto APIs for LZO compression") Reported-by: Askar Safin <safinaskar@gmail.com> Closes: https://lore.kernel.org/linux-pm/20251105180506.137448-1-safinaskar@gmail.com/ Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org> Tested-by: Askar Safin <safinaskar@gmail.com> Cc: 6.9+ <stable@vger.kernel.org> # 6.9+ [ rjw: Added missing braces after "else", changelog edits ] Link: https://patch.msgid.link/20251106045158.3198061-2-superm1@kernel.org Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 6146a0f commit 62b9ca1

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

kernel/power/swap.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -877,11 +877,14 @@ static int save_compressed_image(struct swap_map_handle *handle,
877877
stop = ktime_get();
878878
if (!ret)
879879
ret = err2;
880-
if (!ret)
880+
if (!ret) {
881+
swsusp_show_speed(start, stop, nr_to_write, "Wrote");
882+
pr_info("Image size after compression: %d kbytes\n",
883+
(atomic_read(&compressed_size) / 1024));
881884
pr_info("Image saving done\n");
882-
swsusp_show_speed(start, stop, nr_to_write, "Wrote");
883-
pr_info("Image size after compression: %d kbytes\n",
884-
(atomic_read(&compressed_size) / 1024));
885+
} else {
886+
pr_err("Image saving failed: %d\n", ret);
887+
}
885888

886889
out_clean:
887890
hib_finish_batch(&hb);

0 commit comments

Comments
 (0)