From: Jan Kara <jack@suse.cz> To: linux-mm@kvack.org Cc: "Kirill A. Shutemov" <kirill@shutemov.name>, Ross Zwisler <ross.zwisler@linux.intel.com>, Andrew Morton <akpm@linux-foundation.org>, linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, Jan Kara <jack@suse.cz> Subject: [PATCH 12/20] mm: Pass vm_fault structure into do_page_mkwrite() Date: Fri, 18 Nov 2016 10:17:16 +0100 [thread overview] Message-ID: <1479460644-25076-13-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1479460644-25076-1-git-send-email-jack@suse.cz> We will need more information in the ->page_mkwrite() helper for DAX to be able to fully finish faults there. Pass vm_fault structure to do_page_mkwrite() and use it there so that information propagates properly from upper layers. Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Jan Kara <jack@suse.cz> --- mm/memory.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 139e115acf35..6d4e1b1cea51 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2038,20 +2038,17 @@ static gfp_t __get_fault_gfp_mask(struct vm_area_struct *vma) * * We do this without the lock held, so that it can sleep if it needs to. */ -static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page, - unsigned long address) +static int do_page_mkwrite(struct vm_fault *vmf) { - struct vm_fault vmf; int ret; + struct page *page = vmf->page; + unsigned int old_flags = vmf->flags; - vmf.address = address & PAGE_MASK; - vmf.pgoff = page->index; - vmf.flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE; - vmf.gfp_mask = __get_fault_gfp_mask(vma); - vmf.page = page; - vmf.cow_page = NULL; + vmf->flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE; - ret = vma->vm_ops->page_mkwrite(vma, &vmf); + ret = vmf->vma->vm_ops->page_mkwrite(vmf->vma, vmf); + /* Restore original flags so that caller is not surprised */ + vmf->flags = old_flags; if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) return ret; if (unlikely(!(ret & VM_FAULT_LOCKED))) { @@ -2327,7 +2324,8 @@ static int wp_page_shared(struct vm_fault *vmf, struct page *old_page) int tmp; pte_unmap_unlock(vmf->pte, vmf->ptl); - tmp = do_page_mkwrite(vma, old_page, vmf->address); + vmf->page = old_page; + tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { put_page(old_page); @@ -3289,7 +3287,7 @@ static int do_shared_fault(struct vm_fault *vmf) */ if (vma->vm_ops->page_mkwrite) { unlock_page(vmf->page); - tmp = do_page_mkwrite(vma, vmf->page, vmf->address); + tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { put_page(vmf->page); -- 2.6.6 -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: <linux-mm@kvack.org> Cc: "Kirill A. Shutemov" <kirill@shutemov.name>, Ross Zwisler <ross.zwisler@linux.intel.com>, Andrew Morton <akpm@linux-foundation.org>, <linux-fsdevel@vger.kernel.org>, linux-nvdimm@lists.01.org, Jan Kara <jack@suse.cz> Subject: [PATCH 12/20] mm: Pass vm_fault structure into do_page_mkwrite() Date: Fri, 18 Nov 2016 10:17:16 +0100 [thread overview] Message-ID: <1479460644-25076-13-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1479460644-25076-1-git-send-email-jack@suse.cz> We will need more information in the ->page_mkwrite() helper for DAX to be able to fully finish faults there. Pass vm_fault structure to do_page_mkwrite() and use it there so that information propagates properly from upper layers. Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Jan Kara <jack@suse.cz> --- mm/memory.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 139e115acf35..6d4e1b1cea51 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2038,20 +2038,17 @@ static gfp_t __get_fault_gfp_mask(struct vm_area_struct *vma) * * We do this without the lock held, so that it can sleep if it needs to. */ -static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page, - unsigned long address) +static int do_page_mkwrite(struct vm_fault *vmf) { - struct vm_fault vmf; int ret; + struct page *page = vmf->page; + unsigned int old_flags = vmf->flags; - vmf.address = address & PAGE_MASK; - vmf.pgoff = page->index; - vmf.flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE; - vmf.gfp_mask = __get_fault_gfp_mask(vma); - vmf.page = page; - vmf.cow_page = NULL; + vmf->flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE; - ret = vma->vm_ops->page_mkwrite(vma, &vmf); + ret = vmf->vma->vm_ops->page_mkwrite(vmf->vma, vmf); + /* Restore original flags so that caller is not surprised */ + vmf->flags = old_flags; if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) return ret; if (unlikely(!(ret & VM_FAULT_LOCKED))) { @@ -2327,7 +2324,8 @@ static int wp_page_shared(struct vm_fault *vmf, struct page *old_page) int tmp; pte_unmap_unlock(vmf->pte, vmf->ptl); - tmp = do_page_mkwrite(vma, old_page, vmf->address); + vmf->page = old_page; + tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { put_page(old_page); @@ -3289,7 +3287,7 @@ static int do_shared_fault(struct vm_fault *vmf) */ if (vma->vm_ops->page_mkwrite) { unlock_page(vmf->page); - tmp = do_page_mkwrite(vma, vmf->page, vmf->address); + tmp = do_page_mkwrite(vmf); if (unlikely(!tmp || (tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) { put_page(vmf->page); -- 2.6.6 -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-11-18 9:17 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-18 9:17 [PATCH 0/20 v5] dax: Clear dirty bits after flushing caches Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 01/20] mm: Join struct fault_env and vm_fault Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 10:22 ` Kirill A. Shutemov 2016-11-18 10:22 ` Kirill A. Shutemov 2016-11-18 9:17 ` [PATCH 02/20] mm: Use vmf->address instead of of vmf->virtual_address Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 10:22 ` Kirill A. Shutemov 2016-11-18 10:22 ` Kirill A. Shutemov 2016-11-18 9:17 ` [PATCH 03/20] mm: Use pgoff in struct vm_fault instead of passing it separately Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 04/20] mm: Use passed vm_fault structure in __do_fault() Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 05/20] mm: Trim __do_fault() arguments Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 06/20] mm: Use passed vm_fault structure for in wp_pfn_shared() Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 07/20] mm: Add orig_pte field into vm_fault Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 08/20] mm: Allow full handling of COW faults in ->fault handlers Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 09/20] mm: Factor out functionality to finish page faults Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 10/20] mm: Move handling of COW faults into DAX code Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-21 4:39 ` Ross Zwisler 2016-11-21 4:39 ` Ross Zwisler 2016-11-18 9:17 ` [PATCH 11/20] mm: Factor out common parts of write fault handling Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara [this message] 2016-11-18 9:17 ` [PATCH 12/20] mm: Pass vm_fault structure into do_page_mkwrite() Jan Kara 2016-11-18 10:23 ` Kirill A. Shutemov 2016-11-18 10:23 ` Kirill A. Shutemov 2016-11-18 9:17 ` [PATCH 13/20] mm: Use vmf->page during WP faults Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 14/20] mm: Move part of wp_page_reuse() into the single call site Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 15/20] mm: Provide helper for finishing mkwrite faults Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 16/20] mm: Change return values of finish_mkwrite_fault() Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 17/20] mm: Export follow_pte() Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 18/20] dax: Make cache flushing protected by entry lock Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 19/20] dax: Protect PTE modification on WP fault by radix tree " Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` [PATCH 20/20] dax: Clear dirty entry tags on cache flush Jan Kara 2016-11-18 9:17 ` Jan Kara 2016-11-18 9:17 ` Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1479460644-25076-13-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=akpm@linux-foundation.org \ --cc=kirill@shutemov.name \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=ross.zwisler@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.