Skip to content

Commit 97a7e47

Browse files
xzpetertorvalds
authored andcommitted
mm: introduce page_needs_cow_for_dma() for deciding whether cow
We've got quite a few places (pte, pmd, pud) that explicitly checked against whether we should break the cow right now during fork(). It's easier to provide a helper, especially before we work the same thing on hugetlbfs. Since we'll reference is_cow_mapping() in mm.h, move it there too. Actually it suites mm.h more since internal.h is mm/ only, but mm.h is exported to the whole kernel. With that we should expect another patch to use is_cow_mapping() whenever we can across the kernel since we do use it quite a lot but it's always done with raw code against VM_* flags. Link: https://lkml.kernel.org/r/20210217233547.93892-4-peterx@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Jason Gunthorpe <jgg@ziepe.ca> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@linux.ie> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Gal Pressman <galpress@amazon.com> Cc: Jan Kara <jack@suse.cz> Cc: Jann Horn <jannh@google.com> Cc: Kirill Shutemov <kirill@shutemov.name> Cc: Kirill Tkhai <ktkhai@virtuozzo.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: Roland Scheidegger <sroland@vmware.com> Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> Cc: Wei Zhang <wzam@amazon.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent ca7e045 commit 97a7e47

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

include/linux/mm.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,27 @@ static inline bool page_maybe_dma_pinned(struct page *page)
13001300
GUP_PIN_COUNTING_BIAS;
13011301
}
13021302

1303+
static inline bool is_cow_mapping(vm_flags_t flags)
1304+
{
1305+
return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
1306+
}
1307+
1308+
/*
1309+
* This should most likely only be called during fork() to see whether we
1310+
* should break the cow immediately for a page on the src mm.
1311+
*/
1312+
static inline bool page_needs_cow_for_dma(struct vm_area_struct *vma,
1313+
struct page *page)
1314+
{
1315+
if (!is_cow_mapping(vma->vm_flags))
1316+
return false;
1317+
1318+
if (!atomic_read(&vma->vm_mm->has_pinned))
1319+
return false;
1320+
1321+
return page_maybe_dma_pinned(page);
1322+
}
1323+
13031324
#if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP)
13041325
#define SECTION_IN_PAGE_FLAGS
13051326
#endif

mm/huge_memory.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,9 +1100,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
11001100
* best effort that the pinned pages won't be replaced by another
11011101
* random page during the coming copy-on-write.
11021102
*/
1103-
if (unlikely(is_cow_mapping(vma->vm_flags) &&
1104-
atomic_read(&src_mm->has_pinned) &&
1105-
page_maybe_dma_pinned(src_page))) {
1103+
if (unlikely(page_needs_cow_for_dma(vma, src_page))) {
11061104
pte_free(dst_mm, pgtable);
11071105
spin_unlock(src_ptl);
11081106
spin_unlock(dst_ptl);
@@ -1214,9 +1212,7 @@ int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm,
12141212
}
12151213

12161214
/* Please refer to comments in copy_huge_pmd() */
1217-
if (unlikely(is_cow_mapping(vma->vm_flags) &&
1218-
atomic_read(&src_mm->has_pinned) &&
1219-
page_maybe_dma_pinned(pud_page(pud)))) {
1215+
if (unlikely(page_needs_cow_for_dma(vma, pud_page(pud)))) {
12201216
spin_unlock(src_ptl);
12211217
spin_unlock(dst_ptl);
12221218
__split_huge_pud(vma, src_pud, addr);

mm/internal.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,6 @@ static inline unsigned int buddy_order(struct page *page)
296296
*/
297297
#define buddy_order_unsafe(page) READ_ONCE(page_private(page))
298298

299-
static inline bool is_cow_mapping(vm_flags_t flags)
300-
{
301-
return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;
302-
}
303-
304299
/*
305300
* These three helpers classifies VMAs for virtual memory accounting.
306301
*/

mm/memory.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -809,12 +809,8 @@ copy_present_page(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma
809809
pte_t *dst_pte, pte_t *src_pte, unsigned long addr, int *rss,
810810
struct page **prealloc, pte_t pte, struct page *page)
811811
{
812-
struct mm_struct *src_mm = src_vma->vm_mm;
813812
struct page *new_page;
814813

815-
if (!is_cow_mapping(src_vma->vm_flags))
816-
return 1;
817-
818814
/*
819815
* What we want to do is to check whether this page may
820816
* have been pinned by the parent process. If so,
@@ -828,9 +824,7 @@ copy_present_page(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma
828824
* the page count. That might give false positives for
829825
* for pinning, but it will work correctly.
830826
*/
831-
if (likely(!atomic_read(&src_mm->has_pinned)))
832-
return 1;
833-
if (likely(!page_maybe_dma_pinned(page)))
827+
if (likely(!page_needs_cow_for_dma(src_vma, page)))
834828
return 1;
835829

836830
new_page = *prealloc;

0 commit comments

Comments
 (0)