Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3595955rwb; Mon, 16 Jan 2023 10:03:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfrQmiNukZ2VlRTh4OO8NL55xcYvEAKlsLK4ZC887SoIh4IE19nYrpj/ovXR0C0O0gQH2q X-Received: by 2002:a05:6402:2499:b0:499:1ed2:645d with SMTP id q25-20020a056402249900b004991ed2645dmr171272eda.17.1673892185320; Mon, 16 Jan 2023 10:03:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673892185; cv=none; d=google.com; s=arc-20160816; b=fqlEJe36Q8NRBwzYMUckGPWuclG6ZTuHbMqN3ooenGKV7Xb/XsbAoSahMrASUV5fSg 376ddcUoG1p9ilj9ewZPE6Iz6wlcNxYGKf7EMtai5kdzLQA0ly9H/6nRu321VcmS7rM+ OVu4Ubt5H4ld0C79sBCT0SfTL3ZKa9LaLJLciy0IsNKKYl+w6O4AGQBGqCUony5/pStW kQhq2b0Xl0P9Kmqcq5Dw29o4K4tqeoYMc6CIdGzKBR3rjLD0pYKJQOKBGNeFjCmvK4fD XBoZy02UWFqLxoZqkfKncgD7hlnuKQQc95x/CDpGbl/Qlh95xw5BBifo9bSd+xCZ32wM 4EBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature :dkim-signature; bh=lEqhEm8m9g3c7Pky7UfroueEnnbYZOk7iGJcOupvfZg=; b=sQPe4N22Yw5m3776UjscBA+GH1xTyJ2ILhkawmjemhdVbjAz2d9cdqwGZx1od8eAuu bgW7MOTaWZVMnQeKvR0aOgY1epf28bLOZMMiubMMm/C091FFA1yf4rgNSLBFSeq4Tk9u kagnZ0yxcuTXpj+jdkb0Jd1wx9Z/nAFdUYvUVFYNghWOJP5/FnheNJfAuPdH3Fzq4P7N 2ad1YWlmDb6gxnQ4Vb40lMKZyRh7c0oK6fChmbRHYZ238979IxUY0EY/eyQA85uwYjS+ sP3CyMrVlz/7VfTKq0PiqBBRLe5FWJOF+HLn0n+HClX7vPTpAByxWefK+hVW3qlLth4y cCDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=b6KYgdSa; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a20-20020a509b54000000b0047deaeaeb4fsi27577535edj.97.2023.01.16.10.02.53; Mon, 16 Jan 2023 10:03:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=b6KYgdSa; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232813AbjAPQRe (ORCPT + 50 others); Mon, 16 Jan 2023 11:17:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232547AbjAPQQs (ORCPT ); Mon, 16 Jan 2023 11:16:48 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6FF42DE63; Mon, 16 Jan 2023 08:09:44 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 3B60D67973; Mon, 16 Jan 2023 16:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1673885383; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lEqhEm8m9g3c7Pky7UfroueEnnbYZOk7iGJcOupvfZg=; b=b6KYgdSaYfmtyWec91ajKPAuvjXhKI3QreOTviMD4Ie0VF/Na4ESXxhLIf2vBsugxKz9vx Jf7EpjE06lT+L9nEg7sXI0183s7+2lgeuZWWAnyI3/xmfEeLIkDbLgFJuGU0yyx2KUXllf WyaEchKJosk0r4umDMaWZdg9GM2ppck= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1673885383; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lEqhEm8m9g3c7Pky7UfroueEnnbYZOk7iGJcOupvfZg=; b=UNvozQaPwD5Pujnva3ARZxmZ0QPsZHRvFlI1XWaNk+sv3OSk43KFe1gNxLfmINLmPopZsG MLh10BLpod35DHAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 239E5138FE; Mon, 16 Jan 2023 16:09:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id PWSnCMd2xWN7IwAAMHmgww (envelope-from ); Mon, 16 Jan 2023 16:09:43 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id B3B3DA06AD; Mon, 16 Jan 2023 17:09:42 +0100 (CET) Date: Mon, 16 Jan 2023 17:09:42 +0100 From: Jan Kara To: Luis Chamberlain Cc: hch@infradead.org, djwong@kernel.org, song@kernel.org, rafael@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk, jack@suse.cz, bvanassche@acm.org, ebiederm@xmission.com, mchehab@kernel.org, keescook@chromium.org, p.raghav@samsung.com, linux-fsdevel@vger.kernel.org, kernel@tuxforce.de, kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [RFC v3 05/24] fs: add automatic kernel fs freeze / thaw and remove kthread freezing Message-ID: <20230116160942.gcngdac2gee2svsy@quack3> References: <20230114003409.1168311-1-mcgrof@kernel.org> <20230114003409.1168311-6-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230114003409.1168311-6-mcgrof@kernel.org> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 13-01-23 16:33:50, Luis Chamberlain wrote: > Add support to automatically handle freezing and thawing filesystems > during the kernel's suspend/resume cycle. > > This is needed so that we properly really stop IO in flight without > races after userspace has been frozen. Without this we rely on > kthread freezing and its semantics are loose and error prone. > For instance, even though a kthread may use try_to_freeze() and end > up being frozen we have no way of being sure that everything that > has been spawned asynchronously from it (such as timers) have also > been stopped as well. > > A long term advantage of also adding filesystem freeze / thawing > supporting during suspend / hibernation is that long term we may > be able to eventually drop the kernel's thread freezing completely > as it was originally added to stop disk IO in flight as we hibernate > or suspend. > > This does not remove the superflous freezer calls on all filesystems. > Each filesystem must remove all the kthread freezer stuff and peg > the fs_type flags as supporting auto-freezing with the FS_AUTOFREEZE > flag. > > Subsequent patches remove the kthread freezer usage from each > filesystem, one at a time to make all this work bisectable. > Once all filesystems remove the usage of the kthread freezer we > can remove the FS_AUTOFREEZE flag. > > Signed-off-by: Luis Chamberlain Looks good to me. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/super.c | 69 ++++++++++++++++++++++++++++++++++++++++++ > include/linux/fs.h | 14 +++++++++ > kernel/power/process.c | 15 ++++++++- > 3 files changed, 97 insertions(+), 1 deletion(-) > > diff --git a/fs/super.c b/fs/super.c > index 2f77fcb6e555..e8af4c8269ad 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -1853,3 +1853,72 @@ int thaw_super(struct super_block *sb, bool usercall) > return 0; > } > EXPORT_SYMBOL(thaw_super); > + > +#ifdef CONFIG_PM_SLEEP > +static bool super_should_freeze(struct super_block *sb) > +{ > + if (!(sb->s_type->fs_flags & FS_AUTOFREEZE)) > + return false; > + /* > + * We don't freeze virtual filesystems, we skip those filesystems with > + * no backing device. > + */ > + if (sb->s_bdi == &noop_backing_dev_info) > + return false; > + > + return true; > +} > + > +int fs_suspend_freeze_sb(struct super_block *sb, void *priv) > +{ > + int error = 0; > + > + if (!grab_lock_super(sb)) { > + pr_err("%s (%s): freezing failed to grab_super()\n", > + sb->s_type->name, sb->s_id); > + return -ENOTTY; > + } > + > + if (!super_should_freeze(sb)) > + goto out; > + > + pr_info("%s (%s): freezing\n", sb->s_type->name, sb->s_id); > + > + error = freeze_super(sb, false); > + if (!error) > + lockdep_sb_freeze_release(sb); > + else if (error != -EBUSY) > + pr_notice("%s (%s): Unable to freeze, error=%d", > + sb->s_type->name, sb->s_id, error); > + > +out: > + deactivate_locked_super(sb); > + return error; > +} > + > +int fs_suspend_thaw_sb(struct super_block *sb, void *priv) > +{ > + int error = 0; > + > + if (!grab_lock_super(sb)) { > + pr_err("%s (%s): thawing failed to grab_super()\n", > + sb->s_type->name, sb->s_id); > + return -ENOTTY; > + } > + > + if (!super_should_freeze(sb)) > + goto out; > + > + pr_info("%s (%s): thawing\n", sb->s_type->name, sb->s_id); > + > + error = thaw_super(sb, false); > + if (error && error != -EBUSY) > + pr_notice("%s (%s): Unable to unfreeze, error=%d", > + sb->s_type->name, sb->s_id, error); > + > +out: > + deactivate_locked_super(sb); > + return error; > +} > + > +#endif > diff --git a/include/linux/fs.h b/include/linux/fs.h > index f168e72f6ca1..e5bee359e804 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2231,6 +2231,7 @@ struct file_system_type { > #define FS_DISALLOW_NOTIFY_PERM 16 /* Disable fanotify permission events */ > #define FS_ALLOW_IDMAP 32 /* FS has been updated to handle vfs idmappings. */ > #define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */ > +#define FS_AUTOFREEZE (1<<16) /* temporary as we phase kthread freezer out */ > int (*init_fs_context)(struct fs_context *); > const struct fs_parameter_spec *parameters; > struct dentry *(*mount) (struct file_system_type *, int, > @@ -2306,6 +2307,19 @@ extern int user_statfs(const char __user *, struct kstatfs *); > extern int fd_statfs(int, struct kstatfs *); > extern int freeze_super(struct super_block *super, bool usercall); > extern int thaw_super(struct super_block *super, bool usercall); > +#ifdef CONFIG_PM_SLEEP > +int fs_suspend_freeze_sb(struct super_block *sb, void *priv); > +int fs_suspend_thaw_sb(struct super_block *sb, void *priv); > +#else > +static inline int fs_suspend_freeze_sb(struct super_block *sb, void *priv) > +{ > + return 0; > +} > +static inline int fs_suspend_thaw_sb(struct super_block *sb, void *priv) > +{ > + return 0; > +} > +#endif > extern __printf(2, 3) > int super_setup_bdi_name(struct super_block *sb, char *fmt, ...); > extern int super_setup_bdi(struct super_block *sb); > diff --git a/kernel/power/process.c b/kernel/power/process.c > index 6c1c7e566d35..1dd6b0b6b4e5 100644 > --- a/kernel/power/process.c > +++ b/kernel/power/process.c > @@ -140,6 +140,16 @@ int freeze_processes(void) > > BUG_ON(in_atomic()); > > + pr_info("Freezing filesystems ... "); > + error = iterate_supers_reverse_excl(fs_suspend_freeze_sb, NULL); > + if (error) { > + pr_cont("failed\n"); > + iterate_supers_excl(fs_suspend_thaw_sb, NULL); > + thaw_processes(); > + return error; > + } > + pr_cont("done.\n"); > + > /* > * Now that the whole userspace is frozen we need to disable > * the OOM killer to disallow any further interference with > @@ -149,8 +159,10 @@ int freeze_processes(void) > if (!error && !oom_killer_disable(msecs_to_jiffies(freeze_timeout_msecs))) > error = -EBUSY; > > - if (error) > + if (error) { > + iterate_supers_excl(fs_suspend_thaw_sb, NULL); > thaw_processes(); > + } > return error; > } > > @@ -188,6 +200,7 @@ void thaw_processes(void) > pm_nosig_freezing = false; > > oom_killer_enable(); > + iterate_supers_excl(fs_suspend_thaw_sb, NULL); > > pr_info("Restarting tasks ... "); > > -- > 2.35.1 > -- Jan Kara SUSE Labs, CR