From: Matthew Wilcox <matthew.r.wilcox@intel.com> To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox <willy@linux.intel.com> Subject: [PATCH v8 05/22] Add vm_replace_mixed() Date: Tue, 22 Jul 2014 15:47:53 -0400 [thread overview] Message-ID: <b1052af08b49965fd0e6b87b6733b89294c8cc1e.1406058387.git.matthew.r.wilcox@intel.com> (raw) In-Reply-To: <cover.1406058387.git.matthew.r.wilcox@intel.com> In-Reply-To: <cover.1406058387.git.matthew.r.wilcox@intel.com> From: Matthew Wilcox <willy@linux.intel.com> vm_insert_mixed() will fail if there is already a valid PTE at that location. The DAX code would rather replace the previous value with the new PTE. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> --- include/linux/mm.h | 8 ++++++-- mm/memory.c | 34 +++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index e04f531..8d1194c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1958,8 +1958,12 @@ int remap_pfn_range(struct vm_area_struct *, unsigned long addr, int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *); int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); -int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn); +int __vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, + unsigned long pfn, bool replace); +#define vm_insert_mixed(vma, addr, pfn) \ + __vm_insert_mixed(vma, addr, pfn, false) +#define vm_replace_mixed(vma, addr, pfn) \ + __vm_insert_mixed(vma, addr, pfn, true) int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len); diff --git a/mm/memory.c b/mm/memory.c index 42bf429..cf06c97 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1476,7 +1476,7 @@ pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, * pages reserved for the old functions anyway. */ static int insert_page(struct vm_area_struct *vma, unsigned long addr, - struct page *page, pgprot_t prot) + struct page *page, pgprot_t prot, bool replace) { struct mm_struct *mm = vma->vm_mm; int retval; @@ -1492,8 +1492,12 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, if (!pte) goto out; retval = -EBUSY; - if (!pte_none(*pte)) - goto out_unlock; + if (!pte_none(*pte)) { + if (!replace) + goto out_unlock; + VM_BUG_ON(!mutex_is_locked(&vma->vm_file->f_mapping->i_mmap_mutex)); + zap_page_range_single(vma, addr, PAGE_SIZE, NULL); + } /* Ok, finally just insert the thing.. */ get_page(page); @@ -1549,12 +1553,12 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, BUG_ON(vma->vm_flags & VM_PFNMAP); vma->vm_flags |= VM_MIXEDMAP; } - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, false); } EXPORT_SYMBOL(vm_insert_page); static int insert_pfn(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn, pgprot_t prot) + unsigned long pfn, pgprot_t prot, bool replace) { struct mm_struct *mm = vma->vm_mm; int retval; @@ -1566,8 +1570,12 @@ static int insert_pfn(struct vm_area_struct *vma, unsigned long addr, if (!pte) goto out; retval = -EBUSY; - if (!pte_none(*pte)) - goto out_unlock; + if (!pte_none(*pte)) { + if (!replace) + goto out_unlock; + VM_BUG_ON(!mutex_is_locked(&vma->vm_file->f_mapping->i_mmap_mutex)); + zap_page_range_single(vma, addr, PAGE_SIZE, NULL); + } /* Ok, finally just insert the thing.. */ entry = pte_mkspecial(pfn_pte(pfn, prot)); @@ -1620,14 +1628,14 @@ int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, if (track_pfn_insert(vma, &pgprot, pfn)) return -EINVAL; - ret = insert_pfn(vma, addr, pfn, pgprot); + ret = insert_pfn(vma, addr, pfn, pgprot, false); return ret; } EXPORT_SYMBOL(vm_insert_pfn); -int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn) +int __vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, + unsigned long pfn, bool replace) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -1645,11 +1653,11 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, struct page *page; page = pfn_to_page(pfn); - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, replace); } - return insert_pfn(vma, addr, pfn, vma->vm_page_prot); + return insert_pfn(vma, addr, pfn, vma->vm_page_prot, replace); } -EXPORT_SYMBOL(vm_insert_mixed); +EXPORT_SYMBOL(__vm_insert_mixed); /* * maps a range of physical memory into the requested pages. the old -- 2.0.0
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Wilcox <matthew.r.wilcox@intel.com> To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox <willy@linux.intel.com> Subject: [PATCH v8 05/22] Add vm_replace_mixed() Date: Tue, 22 Jul 2014 15:47:53 -0400 [thread overview] Message-ID: <b1052af08b49965fd0e6b87b6733b89294c8cc1e.1406058387.git.matthew.r.wilcox@intel.com> (raw) In-Reply-To: <cover.1406058387.git.matthew.r.wilcox@intel.com> In-Reply-To: <cover.1406058387.git.matthew.r.wilcox@intel.com> From: Matthew Wilcox <willy@linux.intel.com> vm_insert_mixed() will fail if there is already a valid PTE at that location. The DAX code would rather replace the previous value with the new PTE. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> --- include/linux/mm.h | 8 ++++++-- mm/memory.c | 34 +++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index e04f531..8d1194c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1958,8 +1958,12 @@ int remap_pfn_range(struct vm_area_struct *, unsigned long addr, int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *); int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); -int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn); +int __vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, + unsigned long pfn, bool replace); +#define vm_insert_mixed(vma, addr, pfn) \ + __vm_insert_mixed(vma, addr, pfn, false) +#define vm_replace_mixed(vma, addr, pfn) \ + __vm_insert_mixed(vma, addr, pfn, true) int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len); diff --git a/mm/memory.c b/mm/memory.c index 42bf429..cf06c97 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1476,7 +1476,7 @@ pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, * pages reserved for the old functions anyway. */ static int insert_page(struct vm_area_struct *vma, unsigned long addr, - struct page *page, pgprot_t prot) + struct page *page, pgprot_t prot, bool replace) { struct mm_struct *mm = vma->vm_mm; int retval; @@ -1492,8 +1492,12 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, if (!pte) goto out; retval = -EBUSY; - if (!pte_none(*pte)) - goto out_unlock; + if (!pte_none(*pte)) { + if (!replace) + goto out_unlock; + VM_BUG_ON(!mutex_is_locked(&vma->vm_file->f_mapping->i_mmap_mutex)); + zap_page_range_single(vma, addr, PAGE_SIZE, NULL); + } /* Ok, finally just insert the thing.. */ get_page(page); @@ -1549,12 +1553,12 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, BUG_ON(vma->vm_flags & VM_PFNMAP); vma->vm_flags |= VM_MIXEDMAP; } - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, false); } EXPORT_SYMBOL(vm_insert_page); static int insert_pfn(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn, pgprot_t prot) + unsigned long pfn, pgprot_t prot, bool replace) { struct mm_struct *mm = vma->vm_mm; int retval; @@ -1566,8 +1570,12 @@ static int insert_pfn(struct vm_area_struct *vma, unsigned long addr, if (!pte) goto out; retval = -EBUSY; - if (!pte_none(*pte)) - goto out_unlock; + if (!pte_none(*pte)) { + if (!replace) + goto out_unlock; + VM_BUG_ON(!mutex_is_locked(&vma->vm_file->f_mapping->i_mmap_mutex)); + zap_page_range_single(vma, addr, PAGE_SIZE, NULL); + } /* Ok, finally just insert the thing.. */ entry = pte_mkspecial(pfn_pte(pfn, prot)); @@ -1620,14 +1628,14 @@ int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, if (track_pfn_insert(vma, &pgprot, pfn)) return -EINVAL; - ret = insert_pfn(vma, addr, pfn, pgprot); + ret = insert_pfn(vma, addr, pfn, pgprot, false); return ret; } EXPORT_SYMBOL(vm_insert_pfn); -int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn) +int __vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, + unsigned long pfn, bool replace) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -1645,11 +1653,11 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, struct page *page; page = pfn_to_page(pfn); - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, replace); } - return insert_pfn(vma, addr, pfn, vma->vm_page_prot); + return insert_pfn(vma, addr, pfn, vma->vm_page_prot, replace); } -EXPORT_SYMBOL(vm_insert_mixed); +EXPORT_SYMBOL(__vm_insert_mixed); /* * maps a range of physical memory into the requested pages. the old -- 2.0.0 -- 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:[~2014-07-22 19:53 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-07-22 19:47 [PATCH v8 00/22] Support ext4 on NV-DIMMs Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 01/22] Fix XIP fault vs truncate race Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-23 11:21 ` Kirill A. Shutemov 2014-07-23 11:21 ` Kirill A. Shutemov 2014-07-22 19:47 ` [PATCH v8 02/22] Allow page fault handlers to perform the COW Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-23 11:23 ` Kirill A. Shutemov 2014-07-23 11:23 ` Kirill A. Shutemov 2014-07-22 19:47 ` [PATCH v8 03/22] axonram: Fix bug in direct_access Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-23 11:24 ` Kirill A. Shutemov 2014-07-23 11:24 ` Kirill A. Shutemov 2014-07-22 19:47 ` [PATCH v8 04/22] Change direct_access calling convention Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-30 16:03 ` Boaz Harrosh 2014-07-30 16:03 ` Boaz Harrosh 2014-07-30 16:12 ` Boaz Harrosh 2014-07-30 16:12 ` Boaz Harrosh 2014-07-30 20:34 ` Matthew Wilcox 2014-07-30 20:34 ` Matthew Wilcox 2014-07-31 10:16 ` Boaz Harrosh 2014-07-31 10:16 ` Boaz Harrosh 2014-07-30 19:45 ` Matthew Wilcox 2014-07-30 19:45 ` Matthew Wilcox 2014-07-31 10:11 ` Boaz Harrosh 2014-07-31 10:11 ` Boaz Harrosh 2014-07-31 14:13 ` Matthew Wilcox 2014-07-31 14:13 ` Matthew Wilcox 2014-07-31 15:28 ` Boaz Harrosh 2014-07-31 15:28 ` Boaz Harrosh 2014-07-31 17:19 ` Matthew Wilcox 2014-07-31 17:19 ` Matthew Wilcox 2014-07-31 18:04 ` Boaz Harrosh 2014-07-31 18:04 ` Boaz Harrosh 2014-07-31 20:30 ` Zwisler, Ross 2014-07-31 20:30 ` Zwisler, Ross 2014-08-01 18:45 ` Zwisler, Ross 2014-08-01 18:45 ` Zwisler, Ross 2014-07-22 19:47 ` Matthew Wilcox [this message] 2014-07-22 19:47 ` [PATCH v8 05/22] Add vm_replace_mixed() Matthew Wilcox 2014-07-23 9:10 ` Jan Kara 2014-07-23 9:10 ` Jan Kara 2014-07-23 11:45 ` Kirill A. Shutemov 2014-07-23 11:45 ` Kirill A. Shutemov 2014-07-23 13:52 ` Matthew Wilcox 2014-07-23 14:20 ` Kirill A. Shutemov 2014-07-23 14:20 ` Kirill A. Shutemov 2014-07-23 14:27 ` Matthew Wilcox 2014-07-23 14:27 ` Matthew Wilcox 2014-07-23 15:55 ` Kirill A. Shutemov 2014-07-23 15:55 ` Kirill A. Shutemov 2014-07-24 1:36 ` Zhang, Tianfei 2014-07-24 1:36 ` Zhang, Tianfei 2014-07-25 19:44 ` Matthew Wilcox 2014-07-25 19:44 ` Matthew Wilcox 2014-07-28 13:25 ` Kirill A. Shutemov 2014-07-28 13:25 ` Kirill A. Shutemov 2014-07-29 1:55 ` Zhang, Tianfei 2014-07-29 1:55 ` Zhang, Tianfei 2014-07-22 19:47 ` [PATCH v8 06/22] Introduce IS_DAX(inode) Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 07/22] Add copy_to_iter(), copy_from_iter() and iov_iter_zero() Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 08/22] Replace XIP read and write with DAX I/O Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 09/22] Replace ext2_clear_xip_target with dax_clear_blocks Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 10/22] Replace the XIP page fault handler with the DAX page fault handler Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-23 12:10 ` Kirill A. Shutemov 2014-07-23 12:10 ` Kirill A. Shutemov 2014-07-23 13:55 ` Matthew Wilcox 2014-07-23 13:55 ` Matthew Wilcox 2014-07-23 14:10 ` [PATCH v8 00/22] Support ext4 on NV-DIMMs Howard Chu 2014-07-23 14:34 ` Matthew Wilcox 2014-07-23 15:28 ` Howard Chu 2014-07-23 20:55 ` Theodore Ts'o 2014-07-23 16:57 ` [PATCH v8 10/22] Replace the XIP page fault handler with the DAX page fault handler Boaz Harrosh 2014-07-23 16:57 ` Boaz Harrosh 2014-07-23 19:57 ` Matthew Wilcox 2014-07-23 19:57 ` Matthew Wilcox 2014-07-22 19:47 ` [PATCH v8 11/22] Replace xip_truncate_page with dax_truncate_page Matthew Wilcox 2014-07-22 19:47 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 12/22] Replace XIP documentation with DAX documentation Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 13/22] Remove get_xip_mem Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 14/22] ext2: Remove ext2_xip_verify_sb() Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 15/22] ext2: Remove ext2_use_xip Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 16/22] ext2: Remove xip.c and xip.h Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 17/22] Remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 18/22] ext2: Remove ext2_aops_xip Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 19/22] Get rid of most mentions of XIP in ext2 Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 20/22] xip: Add xip_zero_page_range Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 21/22] ext4: Add DAX functionality Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-22 19:48 ` [PATCH v8 22/22] brd: Rename XIP to DAX Matthew Wilcox 2014-07-22 19:48 ` Matthew Wilcox 2014-07-23 12:30 ` [PATCH v8 00/22] Support ext4 on NV-DIMMs Kirill A. Shutemov 2014-07-23 12:30 ` Kirill A. Shutemov 2014-07-23 13:59 ` Matthew Wilcox 2014-07-23 13:59 ` Matthew Wilcox 2014-07-23 15:58 ` Boaz Harrosh 2014-07-23 15:58 ` Boaz Harrosh 2014-07-23 19:50 ` Matthew Wilcox 2014-07-23 19:50 ` Matthew Wilcox 2014-07-24 18:51 ` Ross Zwisler 2014-07-24 18:51 ` Ross Zwisler 2014-07-24 18:51 ` Ross Zwisler
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=b1052af08b49965fd0e6b87b6733b89294c8cc1e.1406058387.git.matthew.r.wilcox@intel.com \ --to=matthew.r.wilcox@intel.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=willy@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.