mm-use-is_cow_mapping-across-tree-where-proper.patch removed from -mm tree
The patch titled
Subject: mm: use is_cow_mapping() across tree where proper
has been removed from the -mm tree. Its filename was
mm-use-is_cow_mapping-across-tree-where-proper.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm: use is_cow_mapping() across tree where proper
After is_cow_mapping() is exported in mm.h, replace some manual checks elsewhere throughout the tree but start to use the new helper.
---
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 4 +--- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- fs/proc/task_mmu.c | 2 -- mm/hugetlb.c | 4 +--- 4 files changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c renamed from drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c~mm-use-is_cow_mapping-across-tree-where-proper +1 -3
@@ -500,8 +500,6 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vvm_fault_t ret;pgoff_t fault_page_size;bool write = vmf->flags &FAULT_FLAG_WRITE ; -bool is_cow_mapping = - (vma->vm_flags & (VM_SHARED |VM_MAYWRITE )) ==VM_MAYWRITE ;switch (pe_size) {case PE_SIZE_PMD :
@@ -518,7 +516,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct v }/* Always do write dirty-tracking and COW on PTE level. */ -if (write && (READ_ONCE (vbo->dirty) || is_cow_mapping)) +if (write && (READ_ONCE (vbo->dirty) ||is_cow_mapping (vma->vm_flags)))return VM_FAULT_FALLBACK ; ret =ttm_bo_vm_reserve (bo, vmf);
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c renamed from drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c~mm-use-is_cow_mapping-across-tree-where-proper +1 -1
@@ -49,7 +49,7 @@ int vmw_mmap(struct file *filp, struct v vma->vm_ops = &vmw_vm_ops;/* Use VM_PFNMAP rather than VM_MIXEDMAP if not a COW mapping */ -if ((vma->vm_flags & (VM_SHARED |VM_MAYWRITE )) !=VM_MAYWRITE ) +if (!is_cow_mapping (vma->vm_flags)) vma->vm_flags = (vma->vm_flags & ~VM_MIXEDMAP ) |VM_PFNMAP ;return 0 ;
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-use-is_cow_mapping-across-tree-where-proper +0 -2
@@ -1036,8 +1036,6 @@ struct clear_refs_private {#ifdef CONFIG_MEM_SOFT_DIRTY -#define is_cow_mapping (flags) (((flags) & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE) -static inline bool pte_is_pinned (struct vm_area_struct *vma,unsigned long addr,pte_t pte) {struct page *page;
mm/hugetlb.c renamed from mm/hugetlb.c~mm-use-is_cow_mapping-across-tree-where-proper +1 -3
@@ -3734,15 +3734,13 @@ int copy_hugetlb_page_range(struct mm_stpte_t *src_pte, *dst_pte, entry, dst_entry;struct page *ptepage;unsigned long addr; -int cow; +bool cow =is_cow_mapping (vma->vm_flags);struct hstate *h =hstate_vma (vma);unsigned long sz =huge_page_size (h);struct address_space *mapping = vma->vm_file->f_mapping;struct mmu_notifier_range range;int ret =0 ; - cow = (vma->vm_flags & (VM_SHARED |VM_MAYWRITE )) ==VM_MAYWRITE ; -if (cow) { mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, src, vma->vm_start,
_
Patches currently in -mm which might be from [email protected] are
hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share.patch hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share-fix.patch hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled.patch hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix.patch mm-hugetlb-move-flush_hugetlb_tlb_range-into-hugetlbh.patch hugetlb-userfaultfd-unshare-all-pmds-for-hugetlbfs-when-register-wp.patch userfaultfd-selftests-use-user-mode-only.patch userfaultfd-selftests-remove-the-time-check-on-delayed-uffd.patch userfaultfd-selftests-dropping-verify-check-in-locking_thread.patch userfaultfd-selftests-only-dump-counts-if-mode-enabled.patch userfaultfd-selftests-unify-error-handling.patch