netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add VmData field to /proc/{pid}/status

Browse Source 
VmData is the size of private data segments.
It has the same meaning as in Linux.

Change-Id: Iebf1ae85940a810524a6cde9c2e767d4233ddb2a
PiperOrigin-RevId: 250593739
This commit is contained in:
chris.zn
2019-05-30 12:07:40 -07:00
committed by Shentubot
parent 035a8fa38e
commit b18df9bed6
7 changed files with 119 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fs/proc/task.go
+3 -1
View File
@@ -578,7 +578,7 @@ func (s *statusData) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle) (
}
fmt.Fprintf(&buf, "TracerPid:\t%d\n", tpid)
var fds int
var vss, rss uint64
var vss, rss, data uint64
s.t.WithMuLocked(func(t *kernel.Task) {
if fdm := t.FDMap(); fdm != nil {
fds = fdm.Size()
@@ -586,11 +586,13 @@ func (s *statusData) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle) (
if mm := t.MemoryManager(); mm != nil {
vss = mm.VirtualMemorySize()
rss = mm.ResidentSetSize()
data = mm.VirtualDataSize()
}
})
fmt.Fprintf(&buf, "FDSize:\t%d\n", fds)
fmt.Fprintf(&buf, "VmSize:\t%d kB\n", vss>>10)
fmt.Fprintf(&buf, "VmRSS:\t%d kB\n", rss>>10)
fmt.Fprintf(&buf, "VmData:\t%d kB\n", data>>10)
fmt.Fprintf(&buf, "Threads:\t%d\n", s.t.ThreadGroup().Count())
creds := s.t.Credentials()
fmt.Fprintf(&buf, "CapInh:\t%016x\n", creds.InheritableCaps)
pkg/sentry/mm/lifecycle.go
+1
View File
@@ -69,6 +69,7 @@ func (mm *MemoryManager) Fork(ctx context.Context) (*MemoryManager, error) {
users: 1,
brk: mm.brk,
usageAS: mm.usageAS,
dataAS: mm.dataAS,
// "The child does not inherit its parent's memory locks (mlock(2),
// mlockall(2))." - fork(2). So lockedAS is 0 and defMLockMode is
// MLockNone, both of which are zero values. vma.mlockMode is reset
pkg/sentry/mm/mm.go
+6
View File
@@ -111,6 +111,12 @@ type MemoryManager struct {
// lockedAS is protected by mappingMu.
lockedAS uint64
// dataAS is the size of private data segments, like mm_struct->data_vm.
// It means the vma which is private, writable, not stack.
//
// dataAS is protected by mappingMu.
dataAS uint64
// New VMAs created by MMap use whichever of memmap.MMapOpts.MLockMode or
// defMLockMode is greater.
//
pkg/sentry/mm/mm_test.go
+54
View File
@@ -68,6 +68,60 @@ func TestUsageASUpdates(t *testing.T) {
}
}
func (mm *MemoryManager) realDataAS() uint64 {
var sz uint64
for seg := mm.vmas.FirstSegment(); seg.Ok(); seg = seg.NextSegment() {
vma := seg.Value()
if vma.isPrivateDataLocked() {
sz += uint64(seg.Range().Length())
}
}
return sz
}
func TestDataASUpdates(t *testing.T) {
ctx := contexttest.Context(t)
mm := testMemoryManager(ctx)
defer mm.DecUsers(ctx)
addr, err := mm.MMap(ctx, memmap.MMapOpts{
Length: 3 * usermem.PageSize,
Private: true,
Perms: usermem.Write,
MaxPerms: usermem.AnyAccess,
})
if err != nil {
t.Fatalf("MMap got err %v want nil", err)
}
if mm.dataAS == 0 {
t.Fatalf("dataAS is 0, wanted not 0")
}
realDataAS := mm.realDataAS()
if mm.dataAS != realDataAS {
t.Fatalf("dataAS believes %v bytes are mapped; %v bytes are actually mapped", mm.dataAS, realDataAS)
}
mm.MUnmap(ctx, addr, usermem.PageSize)
realDataAS = mm.realDataAS()
if mm.dataAS != realDataAS {
t.Fatalf("dataAS believes %v bytes are mapped; %v bytes are actually mapped", mm.dataAS, realDataAS)
}
mm.MProtect(addr+usermem.PageSize, usermem.PageSize, usermem.Read, false)
realDataAS = mm.realDataAS()
if mm.dataAS != realDataAS {
t.Fatalf("dataAS believes %v bytes are mapped; %v bytes are actually mapped", mm.dataAS, realDataAS)
}
mm.MRemap(ctx, addr+2*usermem.PageSize, usermem.PageSize, 2*usermem.PageSize, MRemapOpts{
Move: MRemapMayMove,
})
realDataAS = mm.realDataAS()
if mm.dataAS != realDataAS {
t.Fatalf("dataAS believes %v bytes are mapped; %v bytes are actually mapped", mm.dataAS, realDataAS)
}
}
func TestBrkDataLimitUpdates(t *testing.T) {
limitSet := limits.NewLimitSet()
limitSet.Set(limits.Data, limits.Limit{}, true /* privileged */) // zero RLIMIT_DATA
pkg/sentry/mm/syscalls.go
+24 -3
View File
@@ -527,6 +527,9 @@ func (mm *MemoryManager) MRemap(ctx context.Context, oldAddr usermem.Addr, oldSi
}
vseg := mm.vmas.Insert(mm.vmas.FindGap(newAR.Start), newAR, vma)
mm.usageAS += uint64(newAR.Length())
if vma.isPrivateDataLocked() {
mm.dataAS += uint64(newAR.Length())
}
if vma.mlockMode != memmap.MLockNone {
mm.lockedAS += uint64(newAR.Length())
if vma.mlockMode == memmap.MLockEager {
@@ -556,6 +559,9 @@ func (mm *MemoryManager) MRemap(ctx context.Context, oldAddr usermem.Addr, oldSi
mm.vmas.Remove(vseg)
vseg = mm.vmas.Insert(mm.vmas.FindGap(newAR.Start), newAR, vma)
mm.usageAS = mm.usageAS - uint64(oldAR.Length()) + uint64(newAR.Length())
if vma.isPrivateDataLocked() {
mm.dataAS = mm.dataAS - uint64(oldAR.Length()) + uint64(newAR.Length())
}
if vma.mlockMode != memmap.MLockNone {
mm.lockedAS = mm.lockedAS - uint64(oldAR.Length()) + uint64(newAR.Length())
}
@@ -643,8 +649,16 @@ func (mm *MemoryManager) MProtect(addr usermem.Addr, length uint64, realPerms us
// Update vma permissions.
vma := vseg.ValuePtr()
vmaLength := vseg.Range().Length()
if vma.isPrivateDataLocked() {
mm.dataAS -= uint64(vmaLength)
}
vma.realPerms = realPerms
vma.effectivePerms = effectivePerms
if vma.isPrivateDataLocked() {
mm.dataAS += uint64(vmaLength)
}
// Propagate vma permission changes to pmas.
for pseg.Ok() && pseg.Start() < vseg.End() {
@@ -1150,7 +1164,7 @@ func (mm *MemoryManager) GetSharedFutexKey(ctx context.Context, addr usermem.Add
func (mm *MemoryManager) VirtualMemorySize() uint64 {
mm.mappingMu.RLock()
defer mm.mappingMu.RUnlock()
return uint64(mm.usageAS)
return mm.usageAS
}
// VirtualMemorySizeRange returns the combined length in bytes of all mappings
@@ -1165,12 +1179,19 @@ func (mm *MemoryManager) VirtualMemorySizeRange(ar usermem.AddrRange) uint64 {
func (mm *MemoryManager) ResidentSetSize() uint64 {
mm.activeMu.RLock()
defer mm.activeMu.RUnlock()
return uint64(mm.curRSS)
return mm.curRSS
}
// MaxResidentSetSize returns the value advertised as mm's max RSS in bytes.
func (mm *MemoryManager) MaxResidentSetSize() uint64 {
mm.activeMu.RLock()
defer mm.activeMu.RUnlock()
return uint64(mm.maxRSS)
return mm.maxRSS
}
// VirtualDataSize returns the size of private data segments in mm.
func (mm *MemoryManager) VirtualDataSize() uint64 {
mm.mappingMu.RLock()
defer mm.mappingMu.RUnlock()
return mm.dataAS
}
pkg/sentry/mm/vma.go
+17 -2
View File
@@ -98,7 +98,7 @@ func (mm *MemoryManager) createVMALocked(ctx context.Context, opts memmap.MMapOp
}
// Finally insert the vma.
vseg := mm.vmas.Insert(vgap, ar, vma{
v := vma{
mappable: opts.Mappable,
off: opts.Offset,
realPerms: opts.Perms,
@@ -109,8 +109,13 @@ func (mm *MemoryManager) createVMALocked(ctx context.Context, opts memmap.MMapOp
mlockMode: opts.MLockMode,
id: opts.MappingIdentity,
hint: opts.Hint,
})
}
vseg := mm.vmas.Insert(vgap, ar, v)
mm.usageAS += opts.Length
if v.isPrivateDataLocked() {
mm.dataAS += opts.Length
}
if opts.MLockMode != memmap.MLockNone {
mm.lockedAS += opts.Length
}
@@ -374,6 +379,9 @@ func (mm *MemoryManager) removeVMAsLocked(ctx context.Context, ar usermem.AddrRa
vma.id.DecRef()
}
mm.usageAS -= uint64(vmaAR.Length())
if vma.isPrivateDataLocked() {
mm.dataAS -= uint64(vmaAR.Length())
}
if vma.mlockMode != memmap.MLockNone {
mm.lockedAS -= uint64(vmaAR.Length())
}
@@ -396,6 +404,13 @@ func (vma *vma) canWriteMappableLocked() bool {
return !vma.private && vma.maxPerms.Write
}
// isPrivateDataLocked identify the data segments - private, writable, not stack
//
// Preconditions: mm.mappingMu must be locked.
func (vma *vma) isPrivateDataLocked() bool {
return vma.realPerms.Write && vma.private && !vma.growsDown
}
// vmaSetFunctions implements segment.Functions for vmaSet.
type vmaSetFunctions struct{}
test/syscalls/linux/proc.cc
+14 -1
View File
@@ -1180,7 +1180,7 @@ bool IsDigits(absl::string_view s) {
return std::all_of(s.begin(), s.end(), absl::ascii_isdigit);
}
TEST(ProcPidStatTest, VSSRSS) {
TEST(ProcPidStatTest, VmStats) {
std::string status_str =
ASSERT_NO_ERRNO_AND_VALUE(GetContents("/proc/self/status"));
ASSERT_FALSE(status_str.empty());
@@ -1211,6 +1211,19 @@ TEST(ProcPidStatTest, VSSRSS) {
EXPECT_TRUE(IsDigits(rss_str.substr(0, rss_str.length() - 3))) << rss_str;
// ... which is not 0.
EXPECT_NE('0', rss_str[0]);
const auto data_it = status.find("VmData");
ASSERT_NE(data_it, status.end());
absl::string_view data_str(data_it->second);
// Room for the " kB" suffix plus at least one digit.
ASSERT_GT(data_str.length(), 3);
EXPECT_TRUE(absl::EndsWith(data_str, " kB"));
// Everything else is part of a number.
EXPECT_TRUE(IsDigits(data_str.substr(0, data_str.length() - 3))) << data_str;
// ... which is not 0.
EXPECT_NE('0', data_str[0]);
}
// Parse an array of NUL-terminated char* arrays, returning a vector of strings.