[folded-merged] writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     Subject: cgroup, writeback: add smp_mb() to inode_prepare_wbs_switch()
has been removed from the -mm tree.  Its filename was
     writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix.patch

This patch was dropped because it was folded into writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes.patch

------------------------------------------------------
From: Roman Gushchin <guro@fb.com>
Subject: cgroup, writeback: add smp_mb() to inode_prepare_wbs_switch()

Add a memory barrier between incrementing isw_nr_in_flight and checking
the sb's SB_ACTIVE flag and grabbing an inode in
inode_prepare_wbs_switch().  It's required to prevent grabbing an inode
before incrementing isw_nr_in_flight, otherwise 0 can be obtained as
isw_nr_in_flight in cgroup_writeback_umount() and isw_wq will not be
flushed, potentially leading to a memory corruption.

Added smp_mb() will work in pair with smp_mb() in
cgroup_writeback_umount().

Link: https://lkml.kernel.org/r/YMFa+guFw7OFjf3X@carbon.dhcp.thefacebook.com
Signed-off-by: Roman Gushchin <guro@fb.com>
Suggested-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/fs-writeback.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/fs/fs-writeback.c~writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix
+++ a/fs/fs-writeback.c
@@ -513,6 +513,14 @@ static void inode_switch_wbs_work_fn(str
 static bool inode_prepare_wbs_switch(struct inode *inode,
 				     struct bdi_writeback *new_wb)
 {
+	/*
+	 * Paired with smp_mb() in cgroup_writeback_umount().
+	 * isw_nr_in_flight must be increased before checking SB_ACTIVE and
+	 * grabbing an inode, otherwise isw_nr_in_flight can be observed as 0
+	 * in cgroup_writeback_umount() and the isw_wq will be not flushed.
+	 */
+	smp_mb();
+
 	/* while holding I_WB_SWITCH, no one else can update the association */
 	spin_lock(&inode->i_lock);
 	if (!(inode->i_sb->s_flags & SB_ACTIVE) ||
_

Patches currently in -mm which might be from guro@fb.com are

writeback-cgroup-do-not-switch-inodes-with-i_will_free-flag.patch
writeback-cgroup-add-smp_mb-to-cgroup_writeback_umount.patch
writeback-cgroup-increment-isw_nr_in_flight-before-grabbing-an-inode.patch
writeback-cgroup-switch-to-rcu_work-api-in-inode_switch_wbs.patch
writeback-cgroup-keep-list-of-inodes-attached-to-bdi_writeback.patch
writeback-cgroup-split-out-the-functional-part-of-inode_switch_wbs_work_fn.patch
writeback-cgroup-support-switching-multiple-inodes-at-once.patch
writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes.patch