[PATCH 0/1] PM: hibernate: Fix swap file marking

[PATCH 0/1] PM: hibernate: Fix swap file marking

[Laurent Badel]

It seems that the swap writer might need be flushed after marking the 
signature into the swap files, otherwise the system may power off before
the signature is written. This is what happened on my system (the swap 
file was missing the hibernation signature) and this patch allowed it
to restore from the hibernation image. 

I don't know if it might be due to a peculiarity of the system I am using,
it is a custom board with an iMX28 SoC and the hibernation image is stored
on the gpmi nand flash.

Best regards,

Laurent

Laurent Badel (1):
  PM: hibernate: flush swap writer after marking

 kernel/power/swap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.17.1



-----------------------------
Eaton Industries Manufacturing GmbH ~ Registered place of business: Route de la Longeraie 7, 1110, Morges, Switzerland 

-----------------------------

[PATCH 1/1] PM: hibernate: flush swap writer after marking

[Laurent Badel]

Flush the swap writer after, not before, marking the files, to ensure the
signature is properly written. 

Signed-off-by: Laurent Badel <laurentbadel@eaton.com>
---
 kernel/power/swap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index c73f2e295167..72e33054a2e1 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -497,10 +497,10 @@ static int swap_writer_finish(struct swap_map_handle *handle,
 		unsigned int flags, int error)
 {
 	if (!error) {
-		flush_swap_writer(handle);
 		pr_info("S");
 		error = mark_swapfiles(handle, flags);
 		pr_cont("|\n");
+		flush_swap_writer(handle);
 	}
 
 	if (error)
-- 
2.17.1



-----------------------------
Eaton Industries Manufacturing GmbH ~ Registered place of business: Route de la Longeraie 7, 1110, Morges, Switzerland 

-----------------------------

Re: [PATCH 1/1] PM: hibernate: flush swap writer after marking

[Rafael J. Wysocki]

On Fri, Jan 22, 2021 at 5:49 PM Laurent Badel <laurentbadel@eaton.com> wrote:
>
> Flush the swap writer after, not before, marking the files, to ensure the
> signature is properly written.
>
> Signed-off-by: Laurent Badel <laurentbadel@eaton.com>
> ---
>  kernel/power/swap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index c73f2e295167..72e33054a2e1 100644
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -497,10 +497,10 @@ static int swap_writer_finish(struct swap_map_handle *handle,
>                 unsigned int flags, int error)
>  {
>         if (!error) {
> -               flush_swap_writer(handle);
>                 pr_info("S");
>                 error = mark_swapfiles(handle, flags);
>                 pr_cont("|\n");
> +               flush_swap_writer(handle);
>         }
>
>         if (error)
> --

Applied as 5.11-rc material, thanks!