svn commit: r262228 - in stable: 10/sys/kern 10/sys/sys 10/usr.bin/procstat 9/sys/kern 9/sys/sys 9/usr.bin/procstat

[John Baldwin]

Author: jhb
Date: Wed Feb 19 19:11:14 2014
New Revision: 262228
URL: http://svnweb.freebsd.org/changeset/base/262228

Log:
  MFC 261780:
  Expose OBJT_MGTDEVICE VM objects used for GEM/TTM with drm2 as an
  explicit object type.

Modified:
  stable/9/sys/kern/kern_proc.c
  stable/9/sys/sys/user.h
  stable/9/usr.bin/procstat/procstat.1
  stable/9/usr.bin/procstat/procstat_vm.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)
  stable/9/usr.bin/procstat/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/kern/kern_proc.c
  stable/10/sys/sys/user.h
  stable/10/usr.bin/procstat/procstat.1
  stable/10/usr.bin/procstat/procstat_vm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/kern/kern_proc.c
==============================================================================
--- stable/9/sys/kern/kern_proc.c	Wed Feb 19 18:36:53 2014	(r262227)
+++ stable/9/sys/kern/kern_proc.c	Wed Feb 19 19:11:14 2014	(r262228)
@@ -2261,6 +2261,9 @@ kern_proc_vmmap_out(struct proc *p, stru
 			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;

Modified: stable/9/sys/sys/user.h
==============================================================================
--- stable/9/sys/sys/user.h	Wed Feb 19 18:36:53 2014	(r262227)
+++ stable/9/sys/sys/user.h	Wed Feb 19 19:11:14 2014	(r262228)
@@ -409,6 +409,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

Modified: stable/9/usr.bin/procstat/procstat.1
==============================================================================
--- stable/9/usr.bin/procstat/procstat.1	Wed Feb 19 18:36:53 2014	(r262227)
+++ stable/9/usr.bin/procstat/procstat.1	Wed Feb 19 19:11:14 2014	(r262228)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 20, 2013
+.Dd February 11, 2014
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -418,6 +418,9 @@ dead
 default
 .It dv
 device
+.It md
+device with managed pages
+.Pq GEM/TTM
 .It ph
 physical
 .It sg

Modified: stable/9/usr.bin/procstat/procstat_vm.c
==============================================================================
--- stable/9/usr.bin/procstat/procstat_vm.c	Wed Feb 19 18:36:53 2014	(r262227)
+++ stable/9/usr.bin/procstat/procstat_vm.c	Wed Feb 19 19:11:14 2014	(r262228)
@@ -100,6 +100,9 @@ procstat_vm(struct procstat *procstat, s
 		case KVME_TYPE_SG:
 			str = "sg";
 			break;
+		case KVME_TYPE_MGTDEVICE:
+			str = "md";
+			break;
 		case KVME_TYPE_UNKNOWN:
 		default:
 			str = "??";