From: Domenico Andreoli <domenico.andreoli@linux.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-pm@vger.kernel.org
Subject: Re: Regression: hibernation is broken since e6bc9de714972cac34daa1dc1567ee48a47a9342
Date: Sun, 23 Feb 2020 20:03:11 +0100 [thread overview]
Message-ID: <20200223190311.GA26811@dumbo> (raw)
In-Reply-To: <20200222002319.GK9504@magnolia>
On Fri, Feb 21, 2020 at 04:23:19PM -0800, Darrick J. Wong wrote:
>
> Ok, third try. Does the following work? This is a little more
> selective in that it only disables the write protection on the swap
> device/file that uswusp is going to write to.
Yes it works but also verified that once the S_SWAPFILE bit is cleared
it's never restored, therefore the protecton is gone after the first
hibernation.
>
> --D
>
> diff --git a/kernel/power/user.c b/kernel/power/user.c
> index 77438954cc2b..a3ae9cbbfcf0 100644
> --- a/kernel/power/user.c
> +++ b/kernel/power/user.c
> @@ -372,10 +372,17 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
> */
> swdev = new_decode_dev(swap_area.dev);
> if (swdev) {
> + struct block_device *bd;
> +
> offset = swap_area.offset;
> - data->swap = swap_type_of(swdev, offset, NULL);
> + data->swap = swap_type_of(swdev, offset, &bd);
> if (data->swap < 0)
> error = -ENODEV;
> +
> + inode_lock(bd->bd_inode);
> + bd->bd_inode->i_flags &= ~S_SWAPFILE;
> + inode_unlock(bd->bd_inode);
> + bdput(bd);
> } else {
> data->swap = -1;
> error = -EINVAL;
--
rsa4096: 3B10 0CA1 8674 ACBA B4FE FCD2 CE5B CF17 9960 DE13
ed25519: FFB4 0CC3 7F2E 091D F7DA 356E CC79 2832 ED38 CB05
next prev parent reply other threads:[~2020-02-23 19:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200213172351.GA6747@dumbo>
[not found] ` <20200213175753.GS6874@magnolia>
[not found] ` <20200213183515.GA8798@dumbo>
[not found] ` <20200213193410.GB6868@magnolia>
[not found] ` <20200213194135.GF6870@magnolia>
2020-02-14 21:15 ` Regression: hibernation is broken since e6bc9de714972cac34daa1dc1567ee48a47a9342 Domenico Andreoli
2020-02-19 5:03 ` Darrick J. Wong
2020-02-22 0:23 ` Darrick J. Wong
2020-02-23 19:03 ` Domenico Andreoli [this message]
2020-02-25 20:26 ` Darrick J. Wong
2020-03-17 15:51 ` Brad Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200223190311.GA26811@dumbo \
--to=domenico.andreoli@linux.com \
--cc=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).