Commit 020bc44a authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: switch back to testing for NULL folio->private in ceph_dirty_folio 



Willy requested that we change this back to warning on folio->private
being non-NULl. He's trying to kill off the PG_private flag, and so we'd
like to catch where it's non-NULL.

Add a VM_WARN_ON_FOLIO (since it doesn't exist yet) and change over to
using that instead of VM_BUG_ON_FOLIO along with testing the ->private
pointer.

[ xiubli: define VM_WARN_ON_FOLIO macro in case DEBUG_VM is disabled
  reported by kernel test robot <lkp@intel.com> ]

Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 7467b044

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio) 
	 * Reference snap context in folio->private.  Also set

	 * PagePrivate so that we get invalidate_folio callback.

	 */

	VM_BUG_ON_FOLIO(folio_test_private(folio), folio);

	VM_WARN_ON_FOLIO(folio->private, folio);

	folio_attach_private(folio, snapc);



	return ceph_fscache_dirty_folio(mapping, folio);

include/linux/mmdebug.h

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ void dump_mm(const struct mm_struct *mm); 
	}								\

	unlikely(__ret_warn_once);					\

})

#define VM_WARN_ON_FOLIO(cond, folio)		({			\

	int __ret_warn = !!(cond);					\

									\

	if (unlikely(__ret_warn)) {					\

		dump_page(&folio->page, "VM_WARN_ON_FOLIO(" __stringify(cond)")");\

		WARN_ON(1);						\

	}								\

	unlikely(__ret_warn);						\

})

#define VM_WARN_ON_ONCE_FOLIO(cond, folio)	({			\

	static bool __section(".data.once") __warned;			\

	int __ret_warn_once = !!(cond);					\
@@ -79,6 +88,7 @@ void dump_mm(const struct mm_struct *mm); 
#define VM_WARN_ON(cond) BUILD_BUG_ON_INVALID(cond)

#define VM_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond)

#define VM_WARN_ON_ONCE_PAGE(cond, page)  BUILD_BUG_ON_INVALID(cond)

#define VM_WARN_ON_FOLIO(cond, folio)  BUILD_BUG_ON_INVALID(cond)

#define VM_WARN_ON_ONCE_FOLIO(cond, folio)  BUILD_BUG_ON_INVALID(cond)

#define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond)

#define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond)