Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964820AbbEVG2s (ORCPT ); Fri, 22 May 2015 02:28:48 -0400 Received: from TYO201.gate.nec.co.jp ([210.143.35.51]:55877 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751834AbbEVG2p convert rfc822-to-8bit (ORCPT ); Fri, 22 May 2015 02:28:45 -0400 From: Naoya Horiguchi To: Mike Kravetz CC: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Dave Hansen , David Rientjes , Hugh Dickins , Davidlohr Bueso , Aneesh Kumar , Hillf Danton , Christoph Hellwig Subject: Re: [RFC v3 PATCH 04/10] mm/hugetlb: expose hugetlb fault mutex for use by fallocate Thread-Topic: [RFC v3 PATCH 04/10] mm/hugetlb: expose hugetlb fault mutex for use by fallocate Thread-Index: AQHQk92QlNUXvyjnbE2Dj8EAumCMkZ2G8RkA Date: Fri, 22 May 2015 06:23:45 +0000 Message-ID: <20150522062344.GB21526@hori1.linux.bs1.fc.nec.co.jp> References: <1432223264-4414-1-git-send-email-mike.kravetz@oracle.com> <1432223264-4414-5-git-send-email-mike.kravetz@oracle.com> In-Reply-To: <1432223264-4414-5-git-send-email-mike.kravetz@oracle.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.25] Content-Type: text/plain; charset="iso-2022-jp" Content-ID: <6BFE24611483ED4C88169D16B37842D9@gisp.nec.co.jp> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2969 Lines: 78 On Thu, May 21, 2015 at 08:47:38AM -0700, Mike Kravetz wrote: > hugetlb page faults are currently synchronized by the table of > mutexes (htlb_fault_mutex_table). fallocate code will need to > synchronize with the page fault code when it allocates or > deletes pages. Expose interfaces so that fallocate operations > can be synchronized with page faults. > > Signed-off-by: Mike Kravetz > --- > include/linux/hugetlb.h | 3 +++ > mm/hugetlb.c | 23 ++++++++++++++++++++++- > 2 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index fd337f2..d0d033e 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -82,6 +82,9 @@ void putback_active_hugepage(struct page *page); > bool is_hugepage_active(struct page *page); > void free_huge_page(struct page *page); > void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve); > +u32 hugetlb_fault_mutex_shared_hash(struct address_space *mapping, pgoff_t idx); > +void hugetlb_fault_mutex_lock(u32 hash); > +void hugetlb_fault_mutex_unlock(u32 hash); > > #ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE > pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud); > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 620cc9e..df0d32a 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3183,7 +3183,8 @@ static u32 fault_mutex_hash(struct hstate *h, struct mm_struct *mm, > unsigned long key[2]; > u32 hash; > > - if (vma->vm_flags & VM_SHARED) { > + /* !vma implies this was called from hugetlbfs fallocate code */ > + if (!vma || vma->vm_flags & VM_SHARED) { > key[0] = (unsigned long) mapping; > key[1] = idx; > } else { > @@ -3209,6 +3210,26 @@ static u32 fault_mutex_hash(struct hstate *h, struct mm_struct *mm, > } > #endif > > +/* > + * Interfaces to the fault mutex routines for use by hugetlbfs > + * fallocate code. Faults must be synchronized with page adds or > + * deletes by fallocate. fallocate only deals with shared mappings. > + */ > +u32 hugetlb_fault_mutex_shared_hash(struct address_space *mapping, pgoff_t idx) > +{ > + return fault_mutex_hash(NULL, NULL, NULL, mapping, idx, 0); > +} > + > +void hugetlb_fault_mutex_lock(u32 hash) > +{ > + mutex_lock(&htlb_fault_mutex_table[hash]); > +} > + > +void hugetlb_fault_mutex_unlock(u32 hash) > +{ > + mutex_unlock(&htlb_fault_mutex_table[hash]); > +} > + > int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, > unsigned long address, unsigned int flags) > { You introduce new lock/unlock interfaces, so how about making the existing user of this lock (i.e. hugetlb_fault()) use them? Thanks, Naoya Horiguchi-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/