From 2db08c03f0737a1f32017264a799d02512a6e3cf Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 11 Feb 2014 21:57:37 +0000 Subject: [PATCH] Expose OBJT_MGTDEVICE VM objects used for GEM/TTM with drm2 as an explicit object type. Reviewed by: kib MFC after: 1 week --- sys/kern/kern_proc.c | 3 +++ sys/sys/user.h | 1 + usr.bin/procstat/procstat.1 | 5 ++++- usr.bin/procstat/procstat_vm.c | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 3dc1a584d854..e38d01169498 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2255,6 +2255,9 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb) case OBJT_SG: kve->kve_type = KVME_TYPE_SG; break; + case OBJT_MGTDEVICE: + kve->kve_type = KVME_TYPE_MGTDEVICE; + break; default: kve->kve_type = KVME_TYPE_UNKNOWN; break; diff --git a/sys/sys/user.h b/sys/sys/user.h index eabd84b3ebe1..8576f6d4d4b8 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -414,6 +414,7 @@ struct kinfo_file { #define KVME_TYPE_PHYS 5 #define KVME_TYPE_DEAD 6 #define KVME_TYPE_SG 7 +#define KVME_TYPE_MGTDEVICE 8 #define KVME_TYPE_UNKNOWN 255 #define KVME_PROT_READ 0x00000001 diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index a0aca05be31c..f06b2bca52f1 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 27, 2013 +.Dd February 11, 2014 .Dt PROCSTAT 1 .Os .Sh NAME @@ -416,6 +416,9 @@ dead default .It dv device +.It md +device with managed pages +.Pq GEM/TTM .It ph physical .It sg diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c index d44b9c23ae1c..80fe6a1b04cb 100644 --- a/usr.bin/procstat/procstat_vm.c +++ b/usr.bin/procstat/procstat_vm.c @@ -100,6 +100,9 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) case KVME_TYPE_SG: str = "sg"; break; + case KVME_TYPE_MGTDEVICE: + str = "md"; + break; case KVME_TYPE_UNKNOWN: default: str = "??";