From patchwork Sat Feb 29 16:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marian Klein X-Patchwork-Id: 230074 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83426C3F2CD for ; Sat, 29 Feb 2020 16:05:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 471AB2468E for ; Sat, 29 Feb 2020 16:05:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hLcXQGP8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727273AbgB2QFP (ORCPT ); Sat, 29 Feb 2020 11:05:15 -0500 Received: from mail-io1-f41.google.com ([209.85.166.41]:46433 "EHLO mail-io1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727164AbgB2QFP (ORCPT ); Sat, 29 Feb 2020 11:05:15 -0500 Received: by mail-io1-f41.google.com with SMTP id x21so2433013iox.13 for ; Sat, 29 Feb 2020 08:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=6Y8c6YQN63ibm+SbmIWwaHAalsPxYuO2BuhOlMSJxsI=; b=hLcXQGP80f7blAOrQyGMD5SPa4N0mksAhP7lY/ejNmDOZUJEuEwEQSmdRrQwa0k2et EeAkpIJNmNVNbQP/4XGXeZ1wuQu9EJOUGkfKY7Xz8X63nPeG63xq8UnaXB846KQjT0m0 gIamvpw5AGIrmda/VWv/isJZhFYqysjBz2DnIcqYx0KW0tkEQSiZ0FSpNnFPYnjGKwqj vO7IVwG2Qh+IBr3HObdyUplquM6LJdYrxtP69NTwJl22Djtr9bAA4YTWu7R6TewVKODh g6p+xt1nTkJWZMkE77bFHzXgi9C71St9pp2ljWkkQVlZ39hdGhJXYChR6fnuXp3Bo6X1 ehgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=6Y8c6YQN63ibm+SbmIWwaHAalsPxYuO2BuhOlMSJxsI=; b=HvqKp1GQXZ4+qfUDwthQi+jyuFDV0bBLsjKVGgWAeerW1Hs22BYyeI36efKiXgu9fx Yt+fG2o9tc3iDk7yWPpj+vZrZtlqzN7tq8Wgy+HEt5xAPyEOeOsNiOSsx4NaoZYQNr8b Nc7XBMCWwD5UwqIbOYKjO5trHKEpnJqJLR8wXSHO8e0acFbcjdG79q0UGyj8Gi26BpaE xIGN0iK820xo/MGGzTFEPcUNeMf7SQo6jTtUtCC+Png99+UwBiR5HOP0a7qazQ0cYBik hGtAc4fFMS0Wra1NmnOwas9YuwoMy+5l5MCUUUzf31abta3PTwr+dCqFP5S8pxzgm2QQ q9AQ== X-Gm-Message-State: APjAAAWzxu4Bq5kDR4zId7bsKeQETHQR9UeB7EQl++9kVi8bdU7Kd77M poHM4aR8lxWe1GlgylVqXJx/nP6+n+y6uVSVatsbjT7fRkI= X-Google-Smtp-Source: APXvYqyDeofg1dMIgsk9W6XlNKxobC3j4AsjsL4mu+w0z5/jd4dg2YxCuMLy/kNvOqlvmGXwqg+EJ7aq7WHSCgShTmo= X-Received: by 2002:a02:5b8a:: with SMTP id g132mr7343346jab.78.1582992314329; Sat, 29 Feb 2020 08:05:14 -0800 (PST) MIME-Version: 1.0 From: Marian Klein Date: Sat, 29 Feb 2020 16:05:03 +0000 Message-ID: Subject: hibernation s2disk fix patch for 5.4 and 5.5 To: stable@vger.kernel.org Cc: "Darrick J. Wong" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Dear stable kernel team I tested this on behalf of darrick.wong@oracle.com I do not have push rights to your repo. I tried. Can you include it for 5.4 and 5.5 ? Comment from Darrick This patch should make it so that uswsusp can unlock the swap device prior to writing the memory image to disk, and then lock it again when resuming. Best regards and Thanks Marian Klein diff --git a/include/linux/swap.h b/include/linux/swap.h index 1e99f7ac1d7e..add93e205850 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -458,6 +458,7 @@ extern void swap_free(swp_entry_t); extern void swapcache_free_entries(swp_entry_t *entries, int n); extern int free_swap_and_cache(swp_entry_t); extern int swap_type_of(dev_t, sector_t, struct block_device **); +extern void swap_relockall(void); extern unsigned int count_swap_pages(int, int); extern sector_t map_swap_page(struct page *, struct block_device **); extern sector_t swapdev_block(int, pgoff_t); diff --git a/kernel/power/user.c b/kernel/power/user.c index 77438954cc2b..47671dac7615 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -271,6 +271,8 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, break; } error = hibernation_restore(data->platform_support); + if (!error) + swap_relockall(); break; case SNAPSHOT_FREE: @@ -372,10 +374,16 @@ 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; diff --git a/mm/swapfile.c b/mm/swapfile.c index b2a2e45c9a36..439bfb7263d3 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1799,6 +1799,32 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) return -ENODEV; } +/* Re-lock swap devices after resuming from userspace suspend. */ +void swap_relockall(void) +{ + int type; + + spin_lock(&swap_lock); + for (type = 0; type < nr_swapfiles; type++) { + struct swap_info_struct *sis = swap_info[type]; + struct block_device *bdev = bdgrab(sis->bdev); + + /* + * uswsusp only knows how to suspend to block devices, so we + * can skip swap files. + */ + if (!(sis->flags & SWP_WRITEOK) || + !(sis->flags & SWP_BLKDEV)) + continue; + + inode_lock(bdev->bd_inode); + bdev->bd_inode->i_flags |= S_SWAPFILE; + inode_unlock(bdev->bd_inode); + bdput(bdev); + } + spin_unlock(&swap_lock); +} + /* * Get the (PAGE_SIZE) block corresponding to given offset on the swapdev * corresponding to given index in swap_info (swap type).