Skip to contentSkip to conversation

mm: memory: fix /proc/meminfo reporting for MLOCK_ONFAULT

PATCH In review Lucian Adrian Grijincu 4 participants 9 messages Sep 13, 2019 – Sep 23, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mm: memory: fix /proc/meminfo reporting for MLOCK_ONFAULT

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

- Before this /proc/meminfo fields didn't change as pages were faulted in:

= Start =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps

- After: /proc/meminfo fields are properly updated as pages are touched:

= Start =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:      524220 kB
Mlocked:          524220 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:     1048496 kB
Mlocked:         1048508 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:         176 kB
Mlocked:              60 kB

/proc/self/smaps

Repro code.
---

int mlock2wrap(const void* addr, size_t len, int flags) {
return syscall(SYS_mlock2, addr, len, flags);
}

void smaps() {
char smapscmd[1000];
snprintf(

      smapscmd,
      sizeof(smapscmd) - 1,
      "grep testfile -A 20 /proc/%d/smaps | grep -E '(testfile|Locked)'",
      getpid());

printf("/proc/self/smaps\n");
fflush(stdout);
system(smapscmd);
}

void meminfo() {
const char* meminfocmd = "grep -E '(Mlocked|Unevictable)' /proc/meminfo"; printf("/proc/meminfo\n");
fflush(stdout);
system(meminfocmd);
}

  {                                                 \
    int rc = (call);                                \
    if (rc != 0) {                                  \
      printf("error %d %s\n", rc, strerror(errno)); \
      exit(1);                                      \
    }                                               \

}
int main(int argc, char* argv[]) {
printf("= Start =\n");
meminfo();

  printf("= Creating testfile =\n");
  size_t size = 1 << 30; // 1 GiB
  int fd = open("testfile", O_CREAT | O_RDWR, 0666);
  {
    void* buf = malloc(size);
    write(fd, buf, size);
    free(buf);
  }
  int ret = 0;
  void* addr = NULL;
  addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

  if (argc > 1) {
    PCHECK(mlock2wrap(addr, size, MLOCK_ONFAULT));
    printf("= after mlock2(MLOCK_ONFAULT) =\n");
    meminfo();
    smaps();
    for (size_t i = 0; i < size / 2; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading half of the file =\n");
    meminfo();
    smaps();

    for (size_t i = 0; i < size; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading the entire the file =\n");
    meminfo();
    smaps();
  } else {
    PCHECK(mlock(addr, size));
    printf("= after mlock =\n");
    meminfo();
    smaps();
  }

  PCHECK(munmap(addr, size));
  printf("= after munmap =\n");
  meminfo();
  smaps();

return ret;
}

---

---
 mm/memory.c | 2 ++
 1 file changed, 2 insertions(+)
mm/memory.c +2 -0
index e0c232fe81d9..55da24f33bc4 100644
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);
 	}
 	set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);
 
Signature · 1 line
2.17.1
Acked-by on v3 1/1
#1 lore raw
Quoted 176 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

- Before this /proc/meminfo fields didn't change as pages were faulted in:

= Start =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps

- After: /proc/meminfo fields are properly updated as pages are touched:

= Start =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:      524220 kB
Mlocked:          524220 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:     1048496 kB
Mlocked:         1048508 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:         176 kB
Mlocked:              60 kB

/proc/self/smaps

Repro code.
---

int mlock2wrap(const void* addr, size_t len, int flags) {
return syscall(SYS_mlock2, addr, len, flags);
}

void smaps() {
char smapscmd[1000];
snprintf(

      smapscmd,
      sizeof(smapscmd) - 1,
      "grep testfile -A 20 /proc/%d/smaps | grep -E '(testfile|Locked)'",
      getpid());

printf("/proc/self/smaps\n");
fflush(stdout);
system(smapscmd);
}

void meminfo() {
const char* meminfocmd = "grep -E '(Mlocked|Unevictable)' /proc/meminfo"; printf("/proc/meminfo\n");
fflush(stdout);
system(meminfocmd);
}

  {                                                 \
    int rc = (call);                                \
    if (rc != 0) {                                  \
      printf("error %d %s\n", rc, strerror(errno)); \
      exit(1);                                      \
    }                                               \

}
int main(int argc, char* argv[]) {
printf("= Start =\n");
meminfo();

  printf("= Creating testfile =\n");
  size_t size = 1 << 30; // 1 GiB
  int fd = open("testfile", O_CREAT | O_RDWR, 0666);
  {
    void* buf = malloc(size);
    write(fd, buf, size);
    free(buf);
  }
  int ret = 0;
  void* addr = NULL;
  addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

  if (argc > 1) {
    PCHECK(mlock2wrap(addr, size, MLOCK_ONFAULT));
    printf("= after mlock2(MLOCK_ONFAULT) =\n");
    meminfo();
    smaps();
    for (size_t i = 0; i < size / 2; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading half of the file =\n");
    meminfo();
    smaps();

    for (size_t i = 0; i < size; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading the entire the file =\n");
    meminfo();
    smaps();
  } else {
    PCHECK(mlock(addr, size));
    printf("= after mlock =\n");
    meminfo();
    smaps();
  }

  PCHECK(munmap(addr, size));
  printf("= after munmap =\n");
  meminfo();
  smaps();

return ret;
}

---

---
 mm/memory.c | 2 ++
 1 file changed, 2 insertions(+)
mm/memory.c +0 -0
index e0c232fe81d9..55da24f33bc4 100644

mm/memory.c vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg, · line 3315

Quoted 5 lines
mm/memory.c +2 -0
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);

Thanks!

#2 lore raw
In reply to Lucian Adrian Grijincu

[Cc Hugh]

Quoted 160 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

- Before this /proc/meminfo fields didn't change as pages were faulted in:

= Start =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps

- After: /proc/meminfo fields are properly updated as pages are touched:

= Start =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:      524220 kB
Mlocked:          524220 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:     1048496 kB
Mlocked:         1048508 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:         176 kB
Mlocked:              60 kB

/proc/self/smaps

Repro code.
---

int mlock2wrap(const void* addr, size_t len, int flags) {
return syscall(SYS_mlock2, addr, len, flags);
}

void smaps() {
char smapscmd[1000];
snprintf(

      smapscmd,
      sizeof(smapscmd) - 1,
      "grep testfile -A 20 /proc/%d/smaps | grep -E '(testfile|Locked)'",
      getpid());

printf("/proc/self/smaps\n");
fflush(stdout);
system(smapscmd);
}

void meminfo() {
const char* meminfocmd = "grep -E '(Mlocked|Unevictable)' /proc/meminfo"; printf("/proc/meminfo\n");
fflush(stdout);
system(meminfocmd);
}

  {                                                 \
    int rc = (call);                                \
    if (rc != 0) {                                  \
      printf("error %d %s\n", rc, strerror(errno)); \
      exit(1);                                      \
    }                                               \

}
int main(int argc, char* argv[]) {
printf("= Start =\n");
meminfo();

  printf("= Creating testfile =\n");
  size_t size = 1 << 30; // 1 GiB
  int fd = open("testfile", O_CREAT | O_RDWR, 0666);
  {
    void* buf = malloc(size);
    write(fd, buf, size);
    free(buf);
  }
  int ret = 0;
  void* addr = NULL;
  addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

  if (argc > 1) {
    PCHECK(mlock2wrap(addr, size, MLOCK_ONFAULT));
    printf("= after mlock2(MLOCK_ONFAULT) =\n");
    meminfo();
    smaps();
    for (size_t i = 0; i < size / 2; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading half of the file =\n");
    meminfo();
    smaps();

    for (size_t i = 0; i < size; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading the entire the file =\n");
    meminfo();
    smaps();
  } else {
    PCHECK(mlock(addr, size));
    printf("= after mlock =\n");
    meminfo();
    smaps();
  }

  PCHECK(munmap(addr, size));
  printf("= after munmap =\n");
  meminfo();
  smaps();
Quoted 7 lines

return ret;
}

---

Fixes b0f205c2a308 ("mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage")

I am not really sure a backport to stable is really needed because an imprecise accounting is not really critical. Pages should eventually get accounted under memory pressure when they are attempted to unmap IIRC.

Btw. the changelog could benefit from a more details on the issue and the fix description. The reproducer is really nice but it doesn't really explain the maze of the mlock accounting and why only the file backed memory has a problem.

Quoted 9 lines
---
 mm/memory.c | 2 ++
 1 file changed, 2 insertions(+)
mm/memory.c +0 -0
index e0c232fe81d9..55da24f33bc4 100644

mm/memory.c vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg, · line 3317

Quoted 7 lines
mm/memory.c +2 -0
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);
 	}
 	set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);

I dunno. Handling it here in alloc_set_pte sounds a bit weird to me. Altough we already do mlock for CoW pages there, I thought this was more of an exception.
Is there any real reason why this cannot be done in the standard #PF path? finish_fault for example?

Signature · 2 lines
Michal Hocko
SUSE Labs
#3 lore raw
Quoted 10 lines · Michal Hocko
Quoted 10 lines
mm/memory.c +2 -0
index e0c232fe81d9..55da24f33bc4 100644
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);
Quoted 8 lines

mm/memory.c vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg, · line 3317

Quoted 2 lines
mm/memory.c +0 -0
 	}
 	set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);

I dunno. Handling it here in alloc_set_pte sounds a bit weird to me. Altough we already do mlock for CoW pages there, I thought this was more of an exception.
Is there any real reason why this cannot be done in the standard #PF path? finish_fault for example?

alloc_set_pte is called from finish_fault https://github.com/torvalds/linux/blob/v5.2/mm/memory.c#L3400

vm_fault_t finish_fault(struct vm_fault *vmf)

     ...
	if (!ret)
		ret = alloc_set_pte(vmf, vmf->memcg, page);

and inside alloc_set_pte one of the branches of the if-clause already handled mlocked pages:
https://github.com/torvalds/linux/blob/v5.2/mm/memory.c#L3348-L3356

I added it to the else-branch as that seemed like the least intrusive change, but I will move this to finish_fault, probably like this (after I'm done testing):

vm_fault_t finish_fault(struct vm_fault *vmf)

    ...
        if (!ret)
                ret = alloc_set_pte(vmf, vmf->memcg, page);

+ if (!ret && (vmf->vma->vm_flags & VM_LOCKED) && !PageTransCompound(page))
+ mlock_vma_page(page);

Thanks for the review and suggestions!

--
Lucian

#4 lore raw
In reply to Lucian Adrian Grijincu
Quoted 2 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

I don't think there's something wrong with this behaviour. It is okay to keep the page an evictable LRU list (and not account it to NR_MLOCKED). Some pages, like partly mapped THP will never be on unevictable LRU, others will be found by vmscan later.

So, it's not bug per se.

Said that, we probably should try to put pages on unevictable LRU sooner rather than later.

Quoted 174 lines

- Before this /proc/meminfo fields didn't change as pages were faulted in:

= Start =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps
7f8714000000-7f8754000000 rw-s 00000000 08:04 50857050 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:       10128 kB
Mlocked:           10132 kB

/proc/self/smaps

- After: /proc/meminfo fields are properly updated as pages are touched:

= Start =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

= Creating testfile =

= after mlock2(MLOCK_ONFAULT) =
/proc/meminfo

Unevictable:          60 kB
Mlocked:              60 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 0 kB

= after reading half of the file =
/proc/meminfo

Unevictable:      524220 kB
Mlocked:          524220 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 524288 kB

= after reading the entire the file =
/proc/meminfo

Unevictable:     1048496 kB
Mlocked:         1048508 kB

/proc/self/smaps
7f2b9c600000-7f2bdc600000 rw-s 00000000 08:04 63045798 /root/testfile
Locked: 1048576 kB

= after munmap =
/proc/meminfo

Unevictable:         176 kB
Mlocked:              60 kB

/proc/self/smaps

Repro code.
---

int mlock2wrap(const void* addr, size_t len, int flags) {
return syscall(SYS_mlock2, addr, len, flags);
}

void smaps() {
char smapscmd[1000];
snprintf(

      smapscmd,
      sizeof(smapscmd) - 1,
      "grep testfile -A 20 /proc/%d/smaps | grep -E '(testfile|Locked)'",
      getpid());

printf("/proc/self/smaps\n");
fflush(stdout);
system(smapscmd);
}

void meminfo() {
const char* meminfocmd = "grep -E '(Mlocked|Unevictable)' /proc/meminfo"; printf("/proc/meminfo\n");
fflush(stdout);
system(meminfocmd);
}

  {                                                 \
    int rc = (call);                                \
    if (rc != 0) {                                  \
      printf("error %d %s\n", rc, strerror(errno)); \
      exit(1);                                      \
    }                                               \

}
int main(int argc, char* argv[]) {
printf("= Start =\n");
meminfo();

  printf("= Creating testfile =\n");
  size_t size = 1 << 30; // 1 GiB
  int fd = open("testfile", O_CREAT | O_RDWR, 0666);
  {
    void* buf = malloc(size);
    write(fd, buf, size);
    free(buf);
  }
  int ret = 0;
  void* addr = NULL;
  addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

  if (argc > 1) {
    PCHECK(mlock2wrap(addr, size, MLOCK_ONFAULT));
    printf("= after mlock2(MLOCK_ONFAULT) =\n");
    meminfo();
    smaps();
    for (size_t i = 0; i < size / 2; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading half of the file =\n");
    meminfo();
    smaps();

    for (size_t i = 0; i < size; i += 4096) {
      ret += ((char*)addr)[i];
    }
    printf("= after reading the entire the file =\n");
    meminfo();
    smaps();
  } else {
    PCHECK(mlock(addr, size));
    printf("= after mlock =\n");
    meminfo();
    smaps();
  }

  PCHECK(munmap(addr, size));
  printf("= after munmap =\n");
  meminfo();
  smaps();

return ret;
}

---

---
 mm/memory.c | 2 ++
 1 file changed, 2 insertions(+)
mm/memory.c +0 -0
index e0c232fe81d9..55da24f33bc4 100644

mm/memory.c vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg, · line 3315

Quoted 5 lines
mm/memory.c +2 -0
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);

Why do you only do this for file pages?

Quoted 7 lines
mm/memory.c +0 -0
 	}
 	set_pte_at(vma->vm_mm, vmf->address, vmf->pte, entry);
 
Signature · 1 line
2.17.1
Signature · 1 line
 Kirill A. Shutemov
#5 lore raw
Quoted 6 lines · Kirill A. Shutemov
Quoted 2 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

I don't think there's something wrong with this behaviour. It is okay to keep the page an evictable LRU list (and not account it to NR_MLOCKED).

evictable list is an implementation detail. Having an overview about an amount of mlocked pages can be important. Lazy accounting makes this more fuzzy and harder for admins to monitor.

Sure it is not a bug to panic about but it certainly makes life of poor admins harder.

If there is a pathological THP behavior possible then we should look into that as well.

Signature · 2 lines
Michal Hocko
SUSE Labs
#6 lore raw
Quoted 9 lines · Michal Hocko
Quoted 6 lines · Kirill A. Shutemov
Quoted 2 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

I don't think there's something wrong with this behaviour. It is okay to keep the page an evictable LRU list (and not account it to NR_MLOCKED).

evictable list is an implementation detail. Having an overview about an

s/evictable/unevictable/

Quoted 5 lines

amount of mlocked pages can be important. Lazy accounting makes this more fuzzy and harder for admins to monitor.

Sure it is not a bug to panic about but it certainly makes life of poor admins harder.

Good luck with making mlock accounting exact :P

For start, try to handle sanely trylock_page() failure under ptl while dealing with FOLL_MLOCK.

Quoted 2 lines

If there is a pathological THP behavior possible then we should look into that as well.

There's nothing pathological about THP behaviour. See "MLOCKING Transparent Huge Pages" section in Documentation/vm/unevictable-lru.rst.

Signature · 1 line
 Kirill A. Shutemov
#7 lore raw
Quoted 13 lines · Kirill A. Shutemov
Quoted 9 lines · Michal Hocko
Quoted 6 lines · Kirill A. Shutemov
Quoted 2 lines · Lucian Adrian Grijincu

As pages are faulted in MLOCK_ONFAULT correctly updates /proc/self/smaps, but doesn't update /proc/meminfo's Mlocked field.

I don't think there's something wrong with this behaviour. It is okay to keep the page an evictable LRU list (and not account it to NR_MLOCKED).

evictable list is an implementation detail. Having an overview about an

s/evictable/unevictable/

Quoted 7 lines
Quoted 5 lines

amount of mlocked pages can be important. Lazy accounting makes this more fuzzy and harder for admins to monitor.

Sure it is not a bug to panic about but it certainly makes life of poor admins harder.

Good luck with making mlock accounting exact :P

I didn't say exact. All I am saying is that the more imprecise it will be the harder it is for admin to make any sense of the value.

Quoted 2 lines

For start, try to handle sanely trylock_page() failure under ptl while dealing with FOLL_MLOCK.

There are likely cases when accounting is problematic/impossible. But those should be a minority.

Quoted 5 lines
Quoted 2 lines

If there is a pathological THP behavior possible then we should look into that as well.

There's nothing pathological about THP behaviour. See "MLOCKING Transparent Huge Pages" section in Documentation/vm/unevictable-lru.rst.

Thanks this documentation helps. I was worried there is something more going on.

Signature · 2 lines
Michal Hocko
SUSE Labs
#8 lore raw
In reply to Kirill A. Shutemov
Quoted 4 lines · Kirill A. Shutemov
Quoted 4 lines
---
 mm/memory.c | 2 ++
 1 file changed, 2 insertions(+)
Quoted 12 lines

mm/memory.c vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg, · line 3315

Quoted 10 lines
mm/memory.c +2 -0
index e0c232fe81d9..55da24f33bc4 100644
@@ -3311,6 +3311,8 @@ vm_fault_t alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
 	} else {
 		inc_mm_counter_fast(vma->vm_mm, mm_counter_file(page));
 		page_add_file_rmap(page, false);
+		if (vma->vm_flags & VM_LOCKED && !PageTransCompound(page))
+			mlock_vma_page(page);

Why do you only do this for file pages?

Because file pages are locked already, right?

Signature · 1 line
 Kirill A. Shutemov