Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033551AbbKEQDt (ORCPT ); Thu, 5 Nov 2015 11:03:49 -0500 Received: from relay.parallels.com ([195.214.232.42]:57150 "EHLO relay.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1033158AbbKEQDr (ORCPT ); Thu, 5 Nov 2015 11:03:47 -0500 Date: Thu, 5 Nov 2015 19:03:24 +0300 From: Vladimir Davydov To: "Kirill A. Shutemov" CC: Andrew Morton , Andrea Arcangeli , Hugh Dickins , Naoya Horiguchi , Sasha Levin , Minchan Kim , , Subject: Re: [PATCH 4/4] mm: prepare page_referenced() and page_idle to new THP refcounting Message-ID: <20151105160324.GF29259@esperanza> References: <1446564375-72143-1-git-send-email-kirill.shutemov@linux.intel.com> <1446564375-72143-5-git-send-email-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1446564375-72143-5-git-send-email-kirill.shutemov@linux.intel.com> X-ClientProxiedBy: US-EXCH2.sw.swsoft.com (10.255.249.46) To MSK-EXCH1.sw.swsoft.com (10.67.48.55) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2599 Lines: 104 On Tue, Nov 03, 2015 at 05:26:15PM +0200, Kirill A. Shutemov wrote: ... > @@ -812,60 +812,104 @@ static int page_referenced_one(struct page *page, struct vm_area_struct *vma, > spinlock_t *ptl; > int referenced = 0; > struct page_referenced_arg *pra = arg; > + pgd_t *pgd; > + pud_t *pud; > + pmd_t *pmd; > + pte_t *pte; > > - if (unlikely(PageTransHuge(page))) { > - pmd_t *pmd; > - > - /* > - * rmap might return false positives; we must filter > - * these out using page_check_address_pmd(). > - */ > - pmd = page_check_address_pmd(page, mm, address, &ptl); > - if (!pmd) > + if (unlikely(PageHuge(page))) { > + /* when pud is not present, pte will be NULL */ > + pte = huge_pte_offset(mm, address); > + if (!pte) > return SWAP_AGAIN; > > - if (vma->vm_flags & VM_LOCKED) { > + ptl = huge_pte_lockptr(page_hstate(page), mm, pte); > + goto check_pte; > + } > + > + pgd = pgd_offset(mm, address); > + if (!pgd_present(*pgd)) > + return SWAP_AGAIN; > + pud = pud_offset(pgd, address); > + if (!pud_present(*pud)) > + return SWAP_AGAIN; > + pmd = pmd_offset(pud, address); > + > + if (pmd_trans_huge(*pmd)) { > + int ret = SWAP_AGAIN; > + > + ptl = pmd_lock(mm, pmd); > + if (!pmd_present(*pmd)) > + goto unlock_pmd; > + if (unlikely(!pmd_trans_huge(*pmd))) { > spin_unlock(ptl); > + goto map_pte; > + } > + > + if (pmd_page(*pmd) != page) > + goto unlock_pmd; > + > + if (vma->vm_flags & VM_LOCKED) { > pra->vm_flags |= VM_LOCKED; > - return SWAP_FAIL; /* To break the loop */ > + ret = SWAP_FAIL; /* To break the loop */ > + goto unlock_pmd; > } > > if (pmdp_clear_flush_young_notify(vma, address, pmd)) > referenced++; > - > spin_unlock(ptl); > + goto found; > +unlock_pmd: > + spin_unlock(ptl); > + return ret; > } else { > - pte_t *pte; > - > - /* > - * rmap might return false positives; we must filter > - * these out using page_check_address(). > - */ > - pte = page_check_address(page, mm, address, &ptl, 0); > - if (!pte) > + pmd_t pmde = *pmd; > + barrier(); This is supposed to be pmd_t pmde = READ_ONCE(*pmd); Right? I don't understand why we need a barrier here. Why can't we just do } else if (!pmd_present(*pmd)) reutnr SWAP_AGAIN; ? Thanks, Vladimir > + if (!pmd_present(pmde) || pmd_trans_huge(pmde)) > return SWAP_AGAIN; > + } -- 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/