From patchwork Tue Apr 11 17:42:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 749579 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2ZLL4Sdgz9sN5 for ; Wed, 12 Apr 2017 03:49:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bxl7oiC7"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3w2ZLL377kzDq9H for ; Wed, 12 Apr 2017 03:49:14 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bxl7oiC7"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3w2ZC81k0rzDq9K for ; Wed, 12 Apr 2017 03:43:00 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bxl7oiC7"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id 79so695060pgf.0 for ; Tue, 11 Apr 2017 10:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rTheuhE9mx8Z1OSTebjJScY3ajr+iEvY+0zH/HX+7V0=; b=bxl7oiC7iMcZKy52TjW7cxplUTb8h3nRpdJFUavYwHd6WMfoMTdNlxZRwiDTp3oCO5 q+WMuqAPdJDMzR2a/9uSDvQ/JsKwtyExkXkeUQPhkPYy1jRnd3JtzaHU/m0MAf0bfGKc sjdr+/jSVpiSGz8hYO8VZQC0EoBaPYyjKcaJS2K+Iezq1E2axO+RqHPAUOgb4pZuyJSn ExcpVjKvuwrOs8YULRgIrUUPySa5eNt+Ys3UgidQtw6PHsPeGwBNlov4Amgjykb35Cyh Zr3Tn5CHVBuuW9u6GD/CpcCOHmNZzku1kg8ktcb0G1prB5NSl2Ep1ONGVJAj5OizmXNv lSWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rTheuhE9mx8Z1OSTebjJScY3ajr+iEvY+0zH/HX+7V0=; b=HodAVX70K3oNgluVh9mv+9ndE37+ZPT6ZP5+KvvMRkxHGmqJhBHmu/3rby/ttKwsyQ kF0xEKbrjxPt3Ag/MNTk+u0r0W+ygEZ1x5icsIqQg5iYglV6fOc42QQx7jFHDIIzzqqO GCnOAwpy1+qsLbRh/6TR3RJQ7cM629Fed75XynVC8WOd+NTdX3oRtpU+V+J4usuR/lhP gTXMwxPl/0NarP9dLWiRk6dqAnNOB526OjRrFDjX4zSktXJv+VyWIwHDadBLM2ZDCsKK wLT0Zc3axinTXG9SUNW21x+8KAt0UYAERwsA0Raho+CaDFvL21Q1HxcbABDIdx8GOzAv AA2w== X-Gm-Message-State: AN3rC/7oBpk2rVb7kegKzfcXIgn+OjdoO9c2IQfxDVr0aQR5B6VM+MH+hgBDp8deGHLC1A== X-Received: by 10.84.254.4 with SMTP id b4mr1308945plm.64.1491932578634; Tue, 11 Apr 2017 10:42:58 -0700 (PDT) Received: from localhost.localdomain ([103.57.0.128]) by smtp.gmail.com with ESMTPSA id r185sm20182582pfr.72.2017.04.11.10.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 10:42:58 -0700 (PDT) From: Oliver O'Halloran To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/9] mm/huge_memory: Deposit a pgtable for DAX PMD faults when required Date: Wed, 12 Apr 2017 03:42:26 +1000 Message-Id: <20170411174233.21902-3-oohall@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170411174233.21902-1-oohall@gmail.com> References: <20170411174233.21902-1-oohall@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org, arbab@linux.vnet.ibm.com, linux-mm@kvack.org, Oliver O'Halloran , "Aneesh Kumar K.V" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Although all architectures use a deposited page table for THP on anonymous VMAs some architectures (s390 and powerpc) require the deposited storage even for file backed VMAs due to quirks of their MMUs. This patch adds support for depositing a table in DAX PMD fault handling path for archs that require it. Other architectures should see no functional changes. Cc: "Aneesh Kumar K.V" Cc: linux-mm@kvack.org Signed-off-by: Oliver O'Halloran Reviewed-by: Aneesh Kumar K.V --- mm/huge_memory.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index aa01dd47cc65..a84909cf20d3 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -715,7 +715,8 @@ int do_huge_pmd_anonymous_page(struct vm_fault *vmf) } static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t *pmd, pfn_t pfn, pgprot_t prot, bool write) + pmd_t *pmd, pfn_t pfn, pgprot_t prot, bool write, + pgtable_t pgtable) { struct mm_struct *mm = vma->vm_mm; pmd_t entry; @@ -729,6 +730,12 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, entry = pmd_mkyoung(pmd_mkdirty(entry)); entry = maybe_pmd_mkwrite(entry, vma); } + + if (pgtable) { + pgtable_trans_huge_deposit(mm, pmd, pgtable); + atomic_long_inc(&mm->nr_ptes); + } + set_pmd_at(mm, addr, pmd, entry); update_mmu_cache_pmd(vma, addr, pmd); spin_unlock(ptl); @@ -738,6 +745,7 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, pfn_t pfn, bool write) { pgprot_t pgprot = vma->vm_page_prot; + pgtable_t pgtable = NULL; /* * If we had pmd_special, we could avoid all these restrictions, * but we need to be consistent with PTEs and architectures that @@ -752,9 +760,15 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, if (addr < vma->vm_start || addr >= vma->vm_end) return VM_FAULT_SIGBUS; + if (arch_needs_pgtable_deposit()) { + pgtable = pte_alloc_one(vma->vm_mm, addr); + if (!pgtable) + return VM_FAULT_OOM; + } + track_pfn_insert(vma, &pgprot, pfn); - insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write); + insert_pfn_pmd(vma, addr, pmd, pfn, pgprot, write, pgtable); return VM_FAULT_NOPAGE; } EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd); @@ -1611,6 +1625,8 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, tlb->fullmm); tlb_remove_pmd_tlb_entry(tlb, pmd, addr); if (vma_is_dax(vma)) { + if (arch_needs_pgtable_deposit()) + zap_deposited_table(tlb->mm, pmd); spin_unlock(ptl); if (is_huge_zero_pmd(orig_pmd)) tlb_remove_page_size(tlb, pmd_page(orig_pmd), HPAGE_PMD_SIZE);