Skip to content

[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] mempolicy: remove confusing MPOL_MF_LAZY dead code #1869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 2 commits into from
Jun 16, 2026
+1 −23
Merged

[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] mempolicy: remove confusing MPOL_MF_LAZY dead code #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
becf9c2
mempolicy: remove confusing MPOL_MF_LAZY dead code
Oct 3, 2023
99e1a2e
mempolicy: clean up minor dead code in queue_pages_test_walk()
bulwahn Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/uapi/linux/mempolicy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ enum {
#define MPOL_MF_MOVE (1<<1) /* Move pages owned by this process to conform
to policy */
#define MPOL_MF_MOVE_ALL (1<<2) /* Move every page to conform to policy */
#define MPOL_MF_LAZY (1<<3) /* Modifies '_MOVE: lazy migrate on fault */
#define MPOL_MF_LAZY (1<<3) /* UNSUPPORTED FLAG: Lazy migrate on fault */
#define MPOL_MF_INTERNAL (1<<4) /* Internal flags start here */

#define MPOL_MF_VALID (MPOL_MF_STRICT | \
Expand Down
22 changes: 0 additions & 22 deletions mm/mempolicy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,20 +644,13 @@ unsigned long change_prot_numa(struct vm_area_struct *vma,

return nr_updated;
}
#else
static unsigned long change_prot_numa(struct vm_area_struct *vma,
unsigned long addr, unsigned long end)
{
return 0;
}
#endif /* CONFIG_NUMA_BALANCING */

static int queue_pages_test_walk(unsigned long start, unsigned long end,
struct mm_walk *walk)
{
struct vm_area_struct *next, *vma = walk->vma;
struct queue_pages *qp = walk->private;
unsigned long endvma = vma->vm_end;
unsigned long flags = qp->flags;

/* range check first */
Expand Down Expand Up @@ -685,17 +678,6 @@ static int queue_pages_test_walk(unsigned long start, unsigned long end,
!(flags & MPOL_MF_STRICT))
return 1;

if (endvma > end)
endvma = end;

if (flags & MPOL_MF_LAZY) {
/* Similar to task_numa_work, skip inaccessible VMAs */
if (!is_vm_hugetlb_page(vma) && vma_is_accessible(vma) &&
!(vma->vm_flags & VM_MIXEDMAP))
change_prot_numa(vma, start, endvma);
return 1;
}

/*
* Check page nodes, and queue pages to move, in the current vma.
* But if no moving, and no strict checking, the scan can be skipped.
Expand Down Expand Up @@ -1290,9 +1272,6 @@ static long do_mbind(unsigned long start, unsigned long len,
if (IS_ERR(new))
return PTR_ERR(new);

if (flags & MPOL_MF_LAZY)
new->flags |= MPOL_F_MOF;

/*
* If we are using the default policy then operation
* on discontinuous address spaces is okay after all
Expand Down Expand Up @@ -1341,7 +1320,6 @@ static long do_mbind(unsigned long start, unsigned long len,

if (!err) {
if (!list_empty(&pagelist)) {
WARN_ON_ONCE(flags & MPOL_MF_LAZY);
nr_failed |= migrate_pages(&pagelist, new_folio, NULL,
start, MIGRATE_SYNC, MR_MEMPOLICY_MBIND, NULL);
}
Expand Down