Skip to contentSkip to conversation

ocfs2: lock the page in __ocfs2_page_mkwrite()

PATCH New Wengang Wang 3 participants 5 messages Nov 5, 2010 – Nov 17, 2010 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ocfs2: lock the page in __ocfs2_page_mkwrite()

Lock the page in __ocfs2_page_mkwrite(). Or we may get -EINVAL error from ocfs2_grab_pages_for_write() if the page(page cache) gets truncated.

regards,
wengang.

---
 fs/ocfs2/aops.c |    9 +++++++--
 fs/ocfs2/mmap.c |   10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)
fs/ocfs2/aops.c +7 -2
index f1e962c..ade2f48 100644
@@ -1097,6 +1097,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 	unsigned long start, target_index, end_index, index;
 	struct inode *inode = mapping->host;
 	loff_t last_byte;
+	int lockpg= !PageLocked(mmap_page);
 
 	target_index = user_pos >> PAGE_CACHE_SHIFT;
 
@@ -1133,11 +1134,15 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 			 * ocfs2_pagemkwrite() is a little different
 			 * and wants us to directly use the page
 			 * passed in.
+			 * in ocfs2_page_mkwirte() path, the page is already
+			 * locked, don't lock it again.
 			 */
-			lock_page(mmap_page);
+			if (lockpg)
+				lock_page(mmap_page);
 
 			if (mmap_page->mapping != mapping) {
-				unlock_page(mmap_page);
+				if (lockpg)
+					unlock_page(mmap_page);
 				/*
 				 * Sanity check - the locking in
 				 * ocfs2_pagemkwrite() should ensure
fs/ocfs2/mmap.c +7 -3
index 7e32db9..bb29335 100644
@@ -79,9 +79,10 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	 * from do_generic_file_read.
 	 */
 	last_index = (size - 1) >> PAGE_CACHE_SHIFT;
+	lock_page(page);
 	if (unlikely(!size || page->index > last_index)) {
 		ret = -EINVAL;
-		goto out;
+		goto out_unlock;
 	}
 
 	/*
@@ -96,7 +97,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 		 * So return 0 here and let VFS retry.
 		 */
 		ret = 0;
-		goto out;
+		goto out_unlock;
 	}
 
 	/*
@@ -117,7 +118,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	if (ret) {
 		if (ret != -ENOSPC)
 			mlog_errno(ret);
-		goto out;
+		goto out_unlock;
 	}
 
 	ret = ocfs2_write_end_nolock(mapping, pos, len, len, locked_page,
@@ -128,6 +129,9 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	}
 	BUG_ON(ret != len);
 	ret = 0;
+	goto out;
+out_unlock:
+	unlock_page(page);
 out:
 	return ret;
 }
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/1 ocfs2: lock the page in __ocfs2_page_mkwrite()

Any comments on this patch? --It's not DLM related.

regards,
wengang.

Quoted 94 lines · Wengang Wang

Lock the page in __ocfs2_page_mkwrite(). Or we may get -EINVAL error from ocfs2_grab_pages_for_write() if the page(page cache) gets truncated.

regards,
wengang.

---
 fs/ocfs2/aops.c |    9 +++++++--
 fs/ocfs2/mmap.c |   10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)
fs/ocfs2/aops.c +7 -2
index f1e962c..ade2f48 100644
@@ -1097,6 +1097,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 	unsigned long start, target_index, end_index, index;
 	struct inode *inode = mapping->host;
 	loff_t last_byte;
+	int lockpg= !PageLocked(mmap_page);
 
 	target_index = user_pos >> PAGE_CACHE_SHIFT;
 
@@ -1133,11 +1134,15 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 			 * ocfs2_pagemkwrite() is a little different
 			 * and wants us to directly use the page
 			 * passed in.
+			 * in ocfs2_page_mkwirte() path, the page is already
+			 * locked, don't lock it again.
 			 */
-			lock_page(mmap_page);
+			if (lockpg)
+				lock_page(mmap_page);
 
 			if (mmap_page->mapping != mapping) {
-				unlock_page(mmap_page);
+				if (lockpg)
+					unlock_page(mmap_page);
 				/*
 				 * Sanity check - the locking in
 				 * ocfs2_pagemkwrite() should ensure
fs/ocfs2/mmap.c +7 -3
index 7e32db9..bb29335 100644
@@ -79,9 +79,10 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	 * from do_generic_file_read.
 	 */
 	last_index = (size - 1) >> PAGE_CACHE_SHIFT;
+	lock_page(page);
 	if (unlikely(!size || page->index > last_index)) {
 		ret = -EINVAL;
-		goto out;
+		goto out_unlock;
 	}
 
 	/*
@@ -96,7 +97,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 		 * So return 0 here and let VFS retry.
 		 */
 		ret = 0;
-		goto out;
+		goto out_unlock;
 	}
 
 	/*
@@ -117,7 +118,7 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	if (ret) {
 		if (ret != -ENOSPC)
 			mlog_errno(ret);
-		goto out;
+		goto out_unlock;
 	}
 
 	ret = ocfs2_write_end_nolock(mapping, pos, len, len, locked_page,
@@ -128,6 +129,9 @@ static int __ocfs2_page_mkwrite(struct file *file, struct buffer_head *di_bh,
 	}
 	BUG_ON(ret != len);
 	ret = 0;
+	goto out;
+out_unlock:
+	unlock_page(page);
 out:
 	return ret;
 }
Signature · 7 lines
1.7.2.3


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
#2 lore raw

PATCH 1/1 ocfs2: lock the page in __ocfs2_page_mkwrite()

In reply to Wengang Wang
Quoted 2 lines · Wengang Wang

Lock the page in __ocfs2_page_mkwrite(). Or we may get -EINVAL error from ocfs2_grab_pages_for_write() if the page(page cache) gets truncated.

Hmm. Have you seen this happen? Do you have a reproducible
test case? The inode lock and alloc sem are taken in ocfs2_page_mkwrite(), which should prevent real truncation of the file and truncation of the page due to downconvert. I think you're saying that someone could flush the pagecache and cause a problem here, but I'd like to have a testcase.
Also, earlier in __ocfs2_page_mkwrite() we return 0 when the
mapping is wrong. Can we do that again?

Joel

Signature · 7 lines
	Pitchers and catchers report.

Joel Becker
Senior Development Manager
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
#3 lore raw

PATCH 1/1 ocfs2: lock the page in __ocfs2_page_mkwrite()

Quoted 11 lines · Joel Becker
Quoted 2 lines · Wengang Wang

Lock the page in __ocfs2_page_mkwrite(). Or we may get -EINVAL error from ocfs2_grab_pages_for_write() if the page(page cache) gets truncated.

Hmm. Have you seen this happen? Do you have a reproducible
test case? The inode lock and alloc sem are taken in ocfs2_page_mkwrite(), which should prevent real truncation of the file and truncation of the page due to downconvert. I think you're saying that someone could flush the pagecache and cause a problem here, but I'd like to have a testcase.
Also, earlier in __ocfs2_page_mkwrite() we return 0 when the
mapping is wrong. Can we do that again?

orabug#10127979

#4 lore raw

PATCH 1/1 ocfs2: lock the page in __ocfs2_page_mkwrite()

In reply to Wengang Wang

On Fri, Nov 05, 2010 at 12:53:16PM +0800, Wengang Wang wrote:

Here's review based on the assumption we need this change.

fs/ocfs2/aops.c static int ocfs2_grab_pages_for_write(struct address_space *mapping, · line 1100

Quoted 5 lines
fs/ocfs2/aops.c +1 -0
@@ -1097,6 +1097,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 	unsigned long start, target_index, end_index, index;
 	struct inode *inode = mapping->host;
 	loff_t last_byte;
+	int lockpg= !PageLocked(mmap_page);

This change is not necessary. If mmap_page exists, it came from
__ocfs2_page_mkwrite(), where you've locked it, so you know it is locked.

fs/ocfs2/aops.c static int ocfs2_grab_pages_for_write(struct address_space *mapping, · line 1141

Quoted 13 lines
fs/ocfs2/aops.c +4 -1
 	target_index = user_pos >> PAGE_CACHE_SHIFT;
 
@@ -1133,11 +1134,15 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping,
 			 * ocfs2_pagemkwrite() is a little different
 			 * and wants us to directly use the page
 			 * passed in.
+			 * in ocfs2_page_mkwirte() path, the page is already
+			 * locked, don't lock it again.
 			 */
-			lock_page(mmap_page);
+			if (lockpg)
+				lock_page(mmap_page);

This block is only accessed when mmap_page is not NULL. Thus
the page must exist and must be locked (as stated above). You should just BUG_ON(!PageLocked(mmap_page)) here.

Joel

Signature · 9 lines
"I think it would be a good idea."  
        - Mahatma Ghandi, when asked what he thought of Western
          civilization

Joel Becker
Senior Development Manager
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127