Skip to contentSkip to conversation

f2fs: remove folio_detach_private() in .invalidate_folio and .release_folio

PATCH In review Chao Yu 2 participants 8 messages Apr 10, 2023 – Apr 12, 2023 F2FS file system

lore
Share & tools
lore

Chao Yu

author maintainer
#0 lore raw

PATCH 1/2 f2fs: remove folio_detach_private() in .invalidate_folio and .release_folio

We have maintain PagePrivate and page_private and page reference w/ {set,clear}_page_private_*, it doesn't need to call folio_detach_private() in the end of .invalidate_folio and .release_folio, remove it and use f2fs_bug_on instead.

---
 fs/f2fs/data.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +5 -2
index 4946df6dd253..8b179b4bdc03 100644
@@ -3737,7 +3737,8 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
 			inode->i_ino == F2FS_COMPRESS_INO(sbi))
 		clear_page_private_data(&folio->page);
 
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
 }
 
 bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3759,7 +3760,9 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
 	clear_page_private_reference(&folio->page);
 	clear_page_private_gcing(&folio->page);
 
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
+
 	return true;
 }
 
Signature · 8 lines
2.25.1



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
author maintainer
#1 lore raw

PATCH 2/2 f2fs: clean up with {attach,detach}_page_private()

No logic changes.

---
 fs/f2fs/f2fs.h | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)
fs/f2fs/f2fs.h +8 -24
index ec8387da7f74..c378aedcadea 100644
@@ -1416,11 +1416,8 @@ static inline bool page_private_##name(struct page *page) \
 #define PAGE_PRIVATE_SET_FUNC(name, flagname) \
 static inline void set_page_private_##name(struct page *page) \
 { \
-	if (!PagePrivate(page)) { \
-		get_page(page); \
-		SetPagePrivate(page); \
-		set_page_private(page, 0); \
-	} \
+	if (!PagePrivate(page)) \
+		attach_page_private(page, (void *)page->private); \
 	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \
 	set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
 }
@@ -1429,13 +1426,8 @@ static inline void set_page_private_##name(struct page *page) \
 static inline void clear_page_private_##name(struct page *page) \
 { \
 	clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) { \
-		set_page_private(page, 0); \
-		if (PagePrivate(page)) { \
-			ClearPagePrivate(page); \
-			put_page(page); \
-		}\
-	} \
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) \
+		detach_page_private(page); \
 }
 
 PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);
@@ -1464,11 +1456,8 @@ static inline unsigned long get_page_private_data(struct page *page)
 
 static inline void set_page_private_data(struct page *page, unsigned long data)
 {
-	if (!PagePrivate(page)) {
-		get_page(page);
-		SetPagePrivate(page);
-		set_page_private(page, 0);
-	}
+	if (!PagePrivate(page))
+		attach_page_private(page, 0);
 	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page));
 	page_private(page) |= data << PAGE_PRIVATE_MAX;
 }
@@ -1476,13 +1465,8 @@ static inline void set_page_private_data(struct page *page, unsigned long data)
 static inline void clear_page_private_data(struct page *page)
 {
 	page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) {
-		set_page_private(page, 0);
-		if (PagePrivate(page)) {
-			ClearPagePrivate(page);
-			put_page(page);
-		}
-	}
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))
+		detach_page_private(page);
 }
 
 /* For compression */
Signature · 8 lines
2.25.1



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
maintainer
#2 lore raw

Re: [PATCH 2/2] f2fs: clean up with {attach,detach}_page_private()

Quoted 12 lines · Chao Yu

No logic changes.

---
 fs/f2fs/f2fs.h | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)
fs/f2fs/f2fs.h +0 -0
index ec8387da7f74..c378aedcadea 100644

fs/f2fs/f2fs.h static inline bool page_private_##name(struct page *page) \ · line 1420

Quoted 10 lines
fs/f2fs/f2fs.h +2 -5
@@ -1416,11 +1416,8 @@ static inline bool page_private_##name(struct page *page) \
 #define PAGE_PRIVATE_SET_FUNC(name, flagname) \
 static inline void set_page_private_##name(struct page *page) \
 { \
-	if (!PagePrivate(page)) { \
-		get_page(page); \
-		SetPagePrivate(page); \
-		set_page_private(page, 0); \
-	} \
+	if (!PagePrivate(page)) \
+		attach_page_private(page, (void *)page->private); \
		attach_page_private(page, (void *)0);
Quoted 51 lines
fs/f2fs/f2fs.h +6 -19
 	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \
 	set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
 }
@@ -1429,13 +1426,8 @@ static inline void set_page_private_##name(struct page *page) \
 static inline void clear_page_private_##name(struct page *page) \
 { \
 	clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) { \
-		set_page_private(page, 0); \
-		if (PagePrivate(page)) { \
-			ClearPagePrivate(page); \
-			put_page(page); \
-		}\
-	} \
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) \
+		detach_page_private(page); \
 }
 
 PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);
@@ -1464,11 +1456,8 @@ static inline unsigned long get_page_private_data(struct page *page)
 
 static inline void set_page_private_data(struct page *page, unsigned long data)
 {
-	if (!PagePrivate(page)) {
-		get_page(page);
-		SetPagePrivate(page);
-		set_page_private(page, 0);
-	}
+	if (!PagePrivate(page))
+		attach_page_private(page, 0);
 	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page));
 	page_private(page) |= data << PAGE_PRIVATE_MAX;
 }
@@ -1476,13 +1465,8 @@ static inline void set_page_private_data(struct page *page, unsigned long data)
 static inline void clear_page_private_data(struct page *page)
 {
 	page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) {
-		set_page_private(page, 0);
-		if (PagePrivate(page)) {
-			ClearPagePrivate(page);
-			put_page(page);
-		}
-	}
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))
+		detach_page_private(page);
 }
 
 /* For compression */
Signature · 1 line
2.25.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

author maintainer
#3 lore raw

Re: [PATCH 2/2] f2fs: clean up with {attach,detach}_page_private()

Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu

No logic changes.

---
  fs/f2fs/f2fs.h | 32 ++++++++------------------------
  1 file changed, 8 insertions(+), 24 deletions(-)
fs/f2fs/f2fs.h +0 -1
index ec8387da7f74..c378aedcadea 100644
@@ -1416,11 +1416,8 @@ static inline bool page_private_##name(struct page *page) \
  #define PAGE_PRIVATE_SET_FUNC(name, flagname) \
  static inline void set_page_private_##name(struct page *page) \
  { \
-	if (!PagePrivate(page)) { \
Quoted 8 lines

fs/f2fs/f2fs.h static inline bool page_private_##name(struct page *page) \ · line 1420

Quoted 6 lines
fs/f2fs/f2fs.h +2 -4
-		get_page(page); \
-		SetPagePrivate(page); \
-		set_page_private(page, 0); \
-	} \
+	if (!PagePrivate(page)) \
+		attach_page_private(page, (void *)page->private); \
		attach_page_private(page, (void *)0);

Correct, thanks for fixing this.

Thanks,

Quoted 49 lines
Quoted 49 lines
fs/f2fs/f2fs.h +6 -19
  	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page)); \
  	set_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
  }
@@ -1429,13 +1426,8 @@ static inline void set_page_private_##name(struct page *page) \
  static inline void clear_page_private_##name(struct page *page) \
  { \
  	clear_bit(PAGE_PRIVATE_##flagname, &page_private(page)); \
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) { \
-		set_page_private(page, 0); \
-		if (PagePrivate(page)) { \
-			ClearPagePrivate(page); \
-			put_page(page); \
-		}\
-	} \
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) \
+		detach_page_private(page); \
  }
 
  PAGE_PRIVATE_GET_FUNC(nonpointer, NOT_POINTER);
@@ -1464,11 +1456,8 @@ static inline unsigned long get_page_private_data(struct page *page)
 
  static inline void set_page_private_data(struct page *page, unsigned long data)
  {
-	if (!PagePrivate(page)) {
-		get_page(page);
-		SetPagePrivate(page);
-		set_page_private(page, 0);
-	}
+	if (!PagePrivate(page))
+		attach_page_private(page, 0);
  	set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page));
  	page_private(page) |= data << PAGE_PRIVATE_MAX;
  }
@@ -1476,13 +1465,8 @@ static inline void set_page_private_data(struct page *page, unsigned long data)
  static inline void clear_page_private_data(struct page *page)
  {
  	page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);
-	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER)) {
-		set_page_private(page, 0);
-		if (PagePrivate(page)) {
-			ClearPagePrivate(page);
-			put_page(page);
-		}
-	}
+	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))
+		detach_page_private(page);
  }
 
Quoted 3 lines
Quoted 3 lines
fs/f2fs/f2fs.h +0 -0
  /* For compression */
Signature · 1 line
2.25.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#4 lore raw
In reply to Chao Yu
Quoted 15 lines · Chao Yu

We have maintain PagePrivate and page_private and page reference w/ {set,clear}_page_private_*, it doesn't need to call folio_detach_private() in the end of .invalidate_folio and .release_folio, remove it and use f2fs_bug_on instead.

---
 fs/f2fs/data.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +0 -0
index 4946df6dd253..8b179b4bdc03 100644

fs/f2fs/data.c void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length) · line 3741

Quoted 6 lines
fs/f2fs/data.c +2 -1
@@ -3737,7 +3737,8 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
 			inode->i_ino == F2FS_COMPRESS_INO(sbi))
 		clear_page_private_data(&folio->page);
 
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));

I think we can just check page_private() only.

Quoted 16 lines
fs/f2fs/data.c +3 -1
 }
 
 bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3759,7 +3760,9 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
 	clear_page_private_reference(&folio->page);
 	clear_page_private_gcing(&folio->page);
 
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
+
 	return true;
 }
 
Signature · 1 line
2.25.1
author maintainer
#5 lore raw
Quoted 19 lines · Jaegeuk Kim
Quoted 18 lines · Chao Yu

We have maintain PagePrivate and page_private and page reference w/ {set,clear}_page_private_*, it doesn't need to call folio_detach_private() in the end of .invalidate_folio and .release_folio, remove it and use f2fs_bug_on instead.

---
  fs/f2fs/data.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +0 -0
index 4946df6dd253..8b179b4bdc03 100644
@@ -3737,7 +3737,8 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
  			inode->i_ino == F2FS_COMPRESS_INO(sbi))
  		clear_page_private_data(&folio->page);
 
Quoted 5 lines

fs/f2fs/data.c void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length) · line 3741

Quoted 3 lines
fs/f2fs/data.c +2 -1
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));

I think we can just check page_private() only.

Why? how about the case PagePrivate was set, but page_private was't? It must be a bug as well?

Thanks,

Quoted 15 lines
Quoted 15 lines
fs/f2fs/data.c +3 -1
  }
 
  bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3759,7 +3760,9 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
  	clear_page_private_reference(&folio->page);
  	clear_page_private_gcing(&folio->page);
 
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
+
  	return true;
  }
 
Quoted 2 lines
Quoted 2 lines
Signature · 1 line
2.25.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#6 lore raw
Quoted 25 lines · Chao Yu
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu

We have maintain PagePrivate and page_private and page reference w/ {set,clear}_page_private_*, it doesn't need to call folio_detach_private() in the end of .invalidate_folio and .release_folio, remove it and use f2fs_bug_on instead.

---
  fs/f2fs/data.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 12 lines

fs/f2fs/data.c void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length) · line 3740

Quoted 10 lines
fs/f2fs/data.c +2 -1
index 4946df6dd253..8b179b4bdc03 100644
@@ -3737,7 +3737,8 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
  			inode->i_ino == F2FS_COMPRESS_INO(sbi))
  		clear_page_private_data(&folio->page);
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));

I think we can just check page_private() only.

Quoted 2 lines

Why? how about the case PagePrivate was set, but page_private was't? It must be a bug as well?

Given the code, I think both are set all the time. My concern is someone is not doing set/get properly. Actually, I got a panic on page_private() when running fsstress overnight. I'm trying to reproduce it to find which bit was set.

Quoted 4 lines

Thanks,

Quoted 1 line
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
fs/f2fs/data.c +0 -0
  }
  bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3759,7 +3760,9 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
  	clear_page_private_reference(&folio->page);
  	clear_page_private_gcing(&folio->page);
Quoted 8 lines
Quoted 8 lines
fs/f2fs/data.c +3 -1
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
+
  	return true;
  }
Signature · 1 line
2.25.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#7 lore raw
Quoted 26 lines · Jaegeuk Kim
Quoted 25 lines · Chao Yu
Quoted 23 lines · Jaegeuk Kim
Quoted 15 lines · Chao Yu

We have maintain PagePrivate and page_private and page reference w/ {set,clear}_page_private_*, it doesn't need to call folio_detach_private() in the end of .invalidate_folio and .release_folio, remove it and use f2fs_bug_on instead.

---
  fs/f2fs/data.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +0 -0
index 4946df6dd253..8b179b4bdc03 100644

fs/f2fs/data.c void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length) · line 3740

Quoted 5 lines
fs/f2fs/data.c +2 -1
@@ -3737,7 +3737,8 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
  			inode->i_ino == F2FS_COMPRESS_INO(sbi))
  		clear_page_private_data(&folio->page);
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));

I think we can just check page_private() only.

Quoted 7 lines
Quoted 2 lines

Why? how about the case PagePrivate was set, but page_private was't? It must be a bug as well?

Given the code, I think both are set all the time. My concern is someone is not doing set/get properly. Actually, I got a panic on page_private() when running fsstress overnight. I'm trying to reproduce it to find which bit was set.

It turned out that inline bit is somehow set, guessing the bit was not cleared when the first dirty page was truncated or somewhere else.

Anyway, tooking a look at the usecase of flushing inline_data to inode page aggressively, I feel it's kinda hack and may increase the checkpoint latency. Hence, I'd like to remove it simply.

https://lore.kernel.org/linux-f2fs-devel/[email protected]/T/#t

Quoted 16 lines
Quoted 16 lines

Thanks,

Quoted 12 lines
Quoted 12 lines
fs/f2fs/data.c +3 -1
  }
  bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3759,7 +3760,9 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
  	clear_page_private_reference(&folio->page);
  	clear_page_private_gcing(&folio->page);
-	folio_detach_private(folio);
+	f2fs_bug_on(sbi, PagePrivate(&folio->page));
+	f2fs_bug_on(sbi, page_private(&folio->page));
+
  	return true;
  }
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Signature · 1 line
2.25.1

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel