Skip to content

mm: modify rss field only through deticated method #1363

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mm: modify rss field only through deticated method #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions qlib/kernel/kernel/shm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,9 @@ impl MemoryManager {
if vma.mlockMode != MLockMode::MlockNone {
mapping.lockedAS -= r.Len();
}

let mut pt = self.pagetable.write();

pt.pt.MUnmap(r.Start(), r.Len())?;
pt.curRSS -= r.Len();
self.pagetable.write()
.pt.MUnmap(r.Start(), r.Len())?;
self.RemoveRssLock(&r);
let vgap = mapping.vmas.Remove(&vseg);
vseg = vgap.NextSeg();
} else {
Expand Down
33 changes: 11 additions & 22 deletions qlib/kernel/memmgr/mm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,24 +458,10 @@ impl MemoryManager {
let vma = vseg.Value();

if !vma.kernel {
/*if vma.mappable.is_some() {
let mappable = vma.mappable.clone().unwrap();
// todo: fix the Madvise/MADV_DONTNEED, when there are multiple process MAdviseOp::MADV_DONTNEED
// with current implementation, the first Madvise/MADV_DONTNEED will work.
mappable.RemoveMapping(self, &r, vma.offset, vma.CanWriteMappableLocked())?;
}

mapping.usageAS -= r.Len();
if vma.mlockMode != MLockMode::MlockNone {
mapping.lockedAS -= r.Len();
}*/

let mut pt = self.pagetable.write();

pt.pt.MUnmap(r.Start(), r.Len())?;
pt.curRSS -= r.Len();
self.pagetable.write()
.pt.MUnmap(r.Start(), r.Len())?;
self.RemoveRssLock(&r);
}
//let vgap = mapping.vmas.Remove(&vseg);
vseg = vgap.NextSeg();
}

Expand Down Expand Up @@ -504,10 +490,9 @@ impl MemoryManager {
mapping.lockedAS -= r.Len();
}

let mut pt = self.pagetable.write();

pt.pt.MUnmap(r.Start(), r.Len())?;
pt.curRSS -= r.Len();
self.pagetable.write()
.pt.MUnmap(r.Start(), r.Len())?;
self.RemoveRssLock(&r);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this produces redundant pagetable lock acquire/release.

}
let vgap = mapping.vmas.Remove(&vseg);
vseg = vgap.NextSeg();
Expand Down Expand Up @@ -563,7 +548,11 @@ impl MemoryManager {

pub fn RemoveRssLock(&self, ar: &Range) {
let mut pt = self.pagetable.write();
pt.curRSS -= ar.Len();
if ar.Len() <= pt.curRSS {
pt.curRSS -= ar.Len();
} else {
pt.curRSS = 0;
}
}

pub fn GenStatmSnapshot(&self, _task: &Task) -> Vec<u8> {
Expand Down