From: Mitch Harder <mitch.harder@sabayonlinux.org>
To: Xin Zhong <thierryzhong@hotmail.com>
Cc: chris.mason@oracle.com, xin.zhong@intel.com, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs file write debugging patch
Date: Sat, 5 Mar 2011 10:50:14 -0600 [thread overview]
Message-ID: <AANLkTi=gqurEsoMZv+10Np4duOKq4kZf77mTgu6BfkSC@mail.gmail.com> (raw)
In-Reply-To: <AANLkTimDvTraBapv18iOf8wmUh8nSnUay2etXvjEv77P@mail.gmail.com>
I've constructed a test patch that is currently addressing all the
issues on my system.
The portion of Openmotif that was having issues with page faults works
correctly with this patch, and gcc-4.4.5 builds without issue.
I extracted only the portion of the first patch that corrects the
handling of dirty_pages when copied==0, and incorporated the second
patch that falls back to one-page-at-a-time if there are troubles with
page faults.
--- fs/btrfs/file.c 2011-03-05 07:34:43.025131607 -0600
+++ /usr/src/linux/fs/btrfs/file.c 2011-03-05 07:41:45.001260294 -0600
@@ -1023,8 +1023,20 @@
copied = btrfs_copy_from_user(pos, num_pages,
write_bytes, pages, &i);
- dirty_pages = (copied + offset + PAGE_CACHE_SIZE - 1) >>
- PAGE_CACHE_SHIFT;
+
+ /*
+ * if we have trouble faulting in the pages, fall
+ * back to one page at a time
+ */
+ if (copied < write_bytes)
+ nrptrs = 1;
+
+ if (copied == 0)
+ dirty_pages = 0;
+ else
+ dirty_pages = (copied + offset +
+ PAGE_CACHE_SIZE - 1) >>
+ PAGE_CACHE_SHIFT;
if (num_pages > dirty_pages) {
if (copied > 0)
next prev parent reply other threads:[~2011-03-05 16:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 16:36 [PATCH] btrfs file write debugging patch Xin Zhong
2011-03-01 21:09 ` Mitch Harder
2011-03-02 10:58 ` Zhong, Xin
2011-03-02 14:00 ` Xin Zhong
2011-03-04 1:51 ` Chris Mason
2011-03-04 2:32 ` Josef Bacik
2011-03-04 2:42 ` Zhong, Xin
2011-03-04 2:41 ` Josef Bacik
2011-03-04 8:41 ` Zhong, Xin
2011-03-05 16:56 ` Mitch Harder
2011-03-05 17:28 ` Xin Zhong
2011-03-04 12:19 ` Chris Mason
2011-03-04 14:25 ` Xin Zhong
2011-03-04 15:33 ` Mitch Harder
2011-03-04 17:21 ` Mitch Harder
2011-03-05 1:00 ` Xin Zhong
2011-03-05 13:14 ` Mitch Harder
2011-03-05 16:50 ` Mitch Harder [this message]
2011-03-06 18:00 ` Chris Mason
2011-03-07 0:58 ` Chris Mason
2011-03-07 6:07 ` Mitch Harder
2011-03-07 6:37 ` Zhong, Xin
2011-03-07 19:56 ` Maria Wikström
2011-03-07 22:12 ` Johannes Hirte
2011-03-08 2:51 ` Zhong, Xin
-- strict thread matches above, loose matches on Subject: below --
2011-02-25 18:43 [PATCH v2]Btrfs: pwrite blocked when writing from the mmaped buffer of the same page Mitch Harder
2011-02-28 1:46 ` [PATCH] btrfs file write debugging patch Chris Mason
2011-02-28 8:56 ` Zhong, Xin
2011-02-28 14:02 ` Chris Mason
2011-02-28 10:13 ` Johannes Hirte
2011-02-28 14:00 ` Chris Mason
2011-02-28 16:10 ` Josef Bacik
2011-02-28 16:45 ` Maria Wikström
2011-02-28 17:47 ` Mitch Harder
2011-02-28 20:20 ` Mitch Harder
2011-03-01 5:09 ` Mitch Harder
2011-03-01 10:14 ` Zhong, Xin
2011-03-01 11:56 ` Zhong, Xin
2011-03-01 14:54 ` Mitch Harder
2011-03-01 14:51 ` Mitch Harder
2011-03-01 21:56 ` Piotr Szymaniak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=gqurEsoMZv+10Np4duOKq4kZf77mTgu6BfkSC@mail.gmail.com' \
--to=mitch.harder@sabayonlinux.org \
--cc=chris.mason@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=thierryzhong@hotmail.com \
--cc=xin.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).