From: Adam Litke <agl@us.ibm.com>
To: William Lee Irwin III <wli@holomorphy.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 2/2] hugetlb: synchronize alloc with page cache insert
Date: Wed, 11 Jan 2006 16:24:23 -0600 [thread overview]
Message-ID: <1137018263.9672.10.camel@localhost.localdomain> (raw)
In-Reply-To: <1137016960.9672.5.camel@localhost.localdomain>
On Wed, 2006-01-11 at 16:02 -0600, Adam Litke wrote:
> here). The patch doesn't completely close the race (there is a much
> smaller window without the zeroing though). The next patch should close
> the race window completely.
My only concern is if I am using the correct lock for the job here.
hugetlb.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff -upN reference/mm/hugetlb.c current/mm/hugetlb.c
--- reference/mm/hugetlb.c
+++ current/mm/hugetlb.c
@@ -445,6 +445,7 @@ int hugetlb_no_page(struct mm_struct *mm
struct page *page;
struct address_space *mapping;
pte_t new_pte;
+ int shared = vma->vm_flags & VM_SHARED;
mapping = vma->vm_file->f_mapping;
idx = ((address - vma->vm_start) >> HPAGE_SHIFT)
@@ -454,26 +455,31 @@ int hugetlb_no_page(struct mm_struct *mm
* Use page lock to guard against racing truncation
* before we get page_table_lock.
*/
-retry:
page = find_lock_page(mapping, idx);
if (!page) {
if (hugetlb_get_quota(mapping))
goto out;
+
+ if (shared)
+ spin_lock(&mapping->host->i_lock);
+
page = alloc_unzeroed_huge_page(vma, address);
if (!page) {
hugetlb_put_quota(mapping);
+ if (shared)
+ spin_unlock(&mapping->host->i_lock);
goto out;
}
- if (vma->vm_flags & VM_SHARED) {
+ if (shared) {
int err;
err = add_to_page_cache(page, mapping, idx, GFP_KERNEL);
+ spin_unlock(&mapping->host->i_lock);
if (err) {
put_page(page);
hugetlb_put_quota(mapping);
- if (err == -EEXIST)
- goto retry;
+ BUG_ON(-EEXIST);
goto out;
}
} else
--
Adam Litke - (agl at us.ibm.com)
IBM Linux Technology Center
next prev parent reply other threads:[~2006-01-11 22:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-10 19:22 Hugetlb: Shared memory race Adam Litke
2006-01-10 19:44 ` William Lee Irwin III
2006-01-11 22:02 ` [PATCH 1/2] hugetlb: Delay page zeroing for faulted pages Adam Litke
2006-01-11 22:24 ` Adam Litke [this message]
2006-01-11 22:52 ` [PATCH 2/2] hugetlb: synchronize alloc with page cache insert William Lee Irwin III
2006-01-11 23:03 ` Adam Litke
2006-01-11 23:24 ` William Lee Irwin III
2006-01-11 23:46 ` Chen, Kenneth W
2006-01-12 0:40 ` Chen, Kenneth W
2006-01-12 1:05 ` William Lee Irwin III
2006-01-12 17:26 ` Adam Litke
2006-01-12 19:07 ` Chen, Kenneth W
2006-01-12 19:48 ` Adam Litke
2006-01-12 20:06 ` Chen, Kenneth W
2006-01-11 22:42 ` [PATCH 1/2] hugetlb: Delay page zeroing for faulted pages William Lee Irwin III
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=1137018263.9672.10.camel@localhost.localdomain \
--to=agl@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=wli@holomorphy.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).