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 support for /proc/[pid]/stat to trace procfs.

Browse Source 
Updates #4805

PiperOrigin-RevId: 451314545
This commit is contained in:
Ayush Ranjan
2022-05-26 22:24:54 -07:00
committed by gVisor bot
parent 565fbe2151
commit f1c9664506
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/boot/controller.go
+1 -1
View File
@@ -639,7 +639,7 @@ func (cm *containerManager) ProcfsDump(_ *struct{}, out *[]procfs.ProcessProcfsD
*out = make([]procfs.ProcessProcfsDump, 0, len(cm.l.processes))
for _, tg := range pidns.ThreadGroups() {
pid := pidns.IDOfThreadGroup(tg)
procDump, err := procfs.Dump(tg.Leader(), pid)
procDump, err := procfs.Dump(tg.Leader(), pid, pidns)
if err != nil {
log.Warningf("skipping procfs dump for PID %s: %v", pid, err)
continue
runsc/boot/procfs/dump.go
+17 -1
View File
@@ -55,6 +55,12 @@ type Status struct {
VMRSS uint64 `json:"vm_rss,omitempty"`
}
// Stat contains information for /proc/[pid]/stat.
type Stat struct {
PGID int32 `json:"pgid,omitempty"`
SID int32 `json:"sid,omitempty"`
}
// ProcessProcfsDump contains the procfs dump for one process. For more details
// on fields that directly correspond to /proc fields, see proc(5).
type ProcessProcfsDump struct {
@@ -80,6 +86,8 @@ type ProcessProcfsDump struct {
Cgroup []kernel.TaskCgroupEntry `json:"cgroup,omitempty"`
// Status is /proc/[pid]/status.
Status Status `json:"status,omitempty"`
// Stat is /proc/[pid]/stat.
Stat Stat `json:"stat,omitempty"`
}
// getMM returns t's MemoryManager. On success, the MemoryManager's users count
@@ -221,8 +229,15 @@ func getStatus(t *kernel.Task, mm *mm.MemoryManager, pid kernel.ThreadID) Status
}
}
func getStat(t *kernel.Task, pid kernel.ThreadID, pidns *kernel.PIDNamespace) Stat {
return Stat{
PGID: int32(pidns.IDOfProcessGroup(t.ThreadGroup().ProcessGroup())),
SID: int32(pidns.IDOfSession(t.ThreadGroup().Session())),
}
}
// Dump returns a procfs dump for process pid. t must be a task in process pid.
func Dump(t *kernel.Task, pid kernel.ThreadID) (ProcessProcfsDump, error) {
func Dump(t *kernel.Task, pid kernel.ThreadID, pidns *kernel.PIDNamespace) (ProcessProcfsDump, error) {
ctx := t.AsyncContext()
mm := getMM(t)
@@ -251,5 +266,6 @@ func Dump(t *kernel.Task, pid kernel.ThreadID) (ProcessProcfsDump, error) {
// supported in runsc.
Cgroup: t.GetCgroupEntries(),
Status: getStatus(t, mm, pid),
Stat: getStat(t, pid, pidns),
}, nil
}