From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f49.google.com (mail-qg0-f49.google.com [209.85.192.49]) by kanga.kvack.org (Postfix) with ESMTP id 53FE56B019A for ; Thu, 21 May 2015 16:23:52 -0400 (EDT) Received: by qgfa63 with SMTP id a63so28638980qgf.0 for ; Thu, 21 May 2015 13:23:52 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id c1si1298100qcm.31.2015.05.21.13.23.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 May 2015 13:23:51 -0700 (PDT) From: jglisse@redhat.com Subject: [PATCH 27/36] HMM: CPU page fault on migrated memory. Date: Thu, 21 May 2015 16:23:03 -0400 Message-Id: <1432239792-5002-8-git-send-email-jglisse@redhat.com> In-Reply-To: <1432239792-5002-1-git-send-email-jglisse@redhat.com> References: <1432236705-4209-1-git-send-email-j.glisse@gmail.com> <1432239792-5002-1-git-send-email-jglisse@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , joro@8bytes.org, Mel Gorman , "H. Peter Anvin" , Peter Zijlstra , Andrea Arcangeli , Johannes Weiner , Larry Woodman , Rik van Riel , Dave Airlie , Brendan Conoboy , Joe Donohue , Duncan Poole , Sherry Cheung , Subhash Gutti , John Hubbard , Mark Hairgrove , Lucien Dunning , Cameron Buschardt , Arvind Gopalakrishnan , Haggai Eran , Shachar Raindel , Liran Liss , Roland Dreier , Ben Sander , Greg Stoner , John Bridgman , Michael Mantor , Paul Blinzer , Laurent Morichetti , Alexander Deucher , Oded Gabbay , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= From: JA(C)rA'me Glisse When CPU try to access memory that have been migrated to device memory we have to copy it back to system memory. This patch implement the CPU page fault handler for special HMM pte swap entry. Signed-off-by: JA(C)rA'me Glisse --- mm/hmm.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/mm/hmm.c b/mm/hmm.c index 143c6ab..1a7554d 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -476,7 +476,59 @@ int hmm_handle_cpu_fault(struct mm_struct *mm, pmd_t *pmdp, unsigned long addr, unsigned flags, pte_t orig_pte) { - return VM_FAULT_SIGBUS; + unsigned long start, end; + struct hmm_event event; + swp_entry_t entry; + struct hmm *hmm; + dma_addr_t dst; + pte_t new_pte; + int ret; + + /* First check for poisonous entry. */ + entry = pte_to_swp_entry(orig_pte); + if (is_hmm_entry_poisonous(entry)) + return VM_FAULT_SIGBUS; + + hmm = hmm_ref(mm->hmm); + if (!hmm) { + pte_t poison = swp_entry_to_pte(make_hmm_entry_poisonous()); + spinlock_t *ptl; + pte_t *ptep; + + /* Check if cpu pte is already updated. */ + ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl); + if (!pte_same(*ptep, orig_pte)) { + pte_unmap_unlock(ptep, ptl); + return 0; + } + set_pte_at(mm, addr, ptep, poison); + pte_unmap_unlock(ptep, ptl); + return VM_FAULT_SIGBUS; + } + + /* + * TODO we likely want to migrate more then one page at a time, we need + * to call into the device driver to get good hint on the range to copy + * back to system memory. + * + * For now just live with the one page at a time solution. + */ + start = addr & PAGE_MASK; + end = start + PAGE_SIZE; + hmm_event_init(&event, hmm, start, end, HMM_COPY_FROM_DEVICE); + + ret = hmm_migrate_back(hmm, &event, mm, vma, &new_pte, + &dst, start, end); + hmm_unref(hmm); + switch (ret) { + case 0: + return VM_FAULT_MAJOR; + case -ENOMEM: + return VM_FAULT_OOM; + case -EINVAL: + default: + return VM_FAULT_SIGBUS; + } } EXPORT_SYMBOL(hmm_handle_cpu_fault); -- 1.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org