Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753223Ab3COHba (ORCPT ); Fri, 15 Mar 2013 03:31:30 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:52722 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903Ab3COHb2 (ORCPT ); Fri, 15 Mar 2013 03:31:28 -0400 MIME-Version: 1.0 In-Reply-To: <1363283435-7666-25-git-send-email-kirill.shutemov@linux.intel.com> References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> <1363283435-7666-25-git-send-email-kirill.shutemov@linux.intel.com> Date: Fri, 15 Mar 2013 15:31:27 +0800 Message-ID: Subject: Re: [PATCHv2, RFC 24/30] thp: move maybe_pmd_mkwrite() out of mk_huge_pmd() From: Hillf Danton To: "Kirill A. Shutemov" Cc: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2855 Lines: 73 On Fri, Mar 15, 2013 at 1:50 AM, Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > It's confusing that mk_huge_pmd() has sematics different from mk_pte() > or mk_pmd(). > > Let's move maybe_pmd_mkwrite() out of mk_huge_pmd() and adjust > prototype to match mk_pte(). > No urgent if not used subsequently. > Signed-off-by: Kirill A. Shutemov > --- > mm/huge_memory.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 34e0385..be7b7e1 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -691,11 +691,10 @@ pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) > return pmd; > } > > -static inline pmd_t mk_huge_pmd(struct page *page, struct vm_area_struct *vma) > +static inline pmd_t mk_huge_pmd(struct page *page, pgprot_t prot) > { > pmd_t entry; > - entry = mk_pmd(page, vma->vm_page_prot); > - entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > + entry = mk_pmd(page, prot); > entry = pmd_mkhuge(entry); > return entry; > } > @@ -723,7 +722,8 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm, > pte_free(mm, pgtable); > } else { > pmd_t entry; > - entry = mk_huge_pmd(page, vma); > + entry = mk_huge_pmd(page, vma->vm_page_prot); > + entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > /* > * The spinlocking to take the lru_lock inside > * page_add_new_anon_rmap() acts as a full memory > @@ -1212,7 +1212,8 @@ alloc: > goto out_mn; > } else { > pmd_t entry; > - entry = mk_huge_pmd(new_page, vma); > + entry = mk_huge_pmd(new_page, vma->vm_page_prot); > + entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > pmdp_clear_flush(vma, haddr, pmd); > page_add_new_anon_rmap(new_page, vma, haddr); > set_pmd_at(mm, haddr, pmd, entry); > @@ -2382,7 +2383,8 @@ static void collapse_huge_page(struct mm_struct *mm, > __SetPageUptodate(new_page); > pgtable = pmd_pgtable(_pmd); > > - _pmd = mk_huge_pmd(new_page, vma); > + _pmd = mk_huge_pmd(new_page, vma->vm_page_prot); > + _pmd = maybe_pmd_mkwrite(pmd_mkdirty(_pmd), vma); > > /* > * spin_lock() below is not the equivalent of smp_wmb(), so > -- > 1.7.10.4 > -- 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/