Skip to contentSkip to conversation

mm-remove-unused-vmf_insert_mixed_prot.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Apr 6, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: remove unused vmf_insert_mixed_prot()
has been removed from the -mm tree. Its filename was
mm-remove-unused-vmf_insert_mixed_prot.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm: remove unused vmf_insert_mixed_prot()
Date: Sun, 12 Mar 2023 23:40:13 +0000

Patch series "Remove drm/ttm-specific mm changes".

Functionality was added specifically for the DRM TTM driver to support mapping memory for VM_MIXEDMAP VMAs with customised protection flags, however this has now been rolled back as issues were found with this approach.

This series removes the mm changes too, retaining some of the useful comments.

This patch (of 3):

The sole user of vmf_insert_mixed_prot(), the drm ttm module, stopped using this in commit f91142c62161 ("drm/ttm: nuke VM_MIXEDMAP on BO mappings v3") citing use of VM_MIXEDMAP in this case being terribly broken.

Remove this now-dead code and references to it, but retain the useful description of the prot != vma->vm_page_prot case, moving it to vmf_insert_pfn_prot() instead.

Cc Christian König <[email protected]>
Cc Dan Williams <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc Kirill A. Shutemov <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Thomas Hellström <[email protected]>
Cc Aaron Tomlin <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Marcelo Tosatti <[email protected]>
Cc Peter Xu <[email protected]>
Cc "Russell King (Oracle)" <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 include/linux/mm.h       |    2 -
 include/linux/mm_types.h |    7 ----
 mm/memory.c              |   57 +++++++++++--------------------------
 3 files changed, 19 insertions(+), 47 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-remove-unused-vmf_insert_mixed_prot +0 -2
@@ -3179,8 +3179,6 @@ vm_fault_t vmf_insert_pfn_prot(struct vm
 			unsigned long pfn, pgprot_t pgprot);
 vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
 			pfn_t pfn);
-vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr,
-			pfn_t pfn, pgprot_t pgprot);
 vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma,
 		unsigned long addr, pfn_t pfn);
 int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-remove-unused-vmf_insert_mixed_prot +1 -6
@@ -485,12 +485,7 @@ struct vm_area_struct {
 					   within vm_mm. */
 
 	struct mm_struct *vm_mm;	/* The address space we belong to. */
-
-	/*
-	 * Access permissions of this VMA.
-	 * See vmf_insert_mixed_prot() for discussion.
-	 */
-	pgprot_t vm_page_prot;
+	pgprot_t vm_page_prot;          /* Access permissions of this VMA. */
 
 	/*
 	 * Flags, see mm.h.
mm/memory.c renamed from mm/memory.c~mm-remove-unused-vmf_insert_mixed_prot +18 -39

85 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are