Page MenuHomeFreeBSD
Files F150350133

D31163.id92206.diff
No OneTemporary
Actions

D31163.id92206.diff
View Options

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -2471,7 +2471,7 @@
}
static int
-sysctl_vm_object_list(SYSCTL_HANDLER_ARGS)
+vm_object_list_handler(struct sysctl_req *req, bool swap_only)
{
struct kinfo_vmobject *kvo;
char *fullpath, *freepath;
@@ -2509,10 +2509,12 @@
*/
mtx_lock(&vm_object_list_mtx);
TAILQ_FOREACH(obj, &vm_object_list, object_list) {
- if (obj->type == OBJT_DEAD)
+ if (obj->type == OBJT_DEAD ||
+ (swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0))
continue;
VM_OBJECT_RLOCK(obj);
- if (obj->type == OBJT_DEAD) {
+ if (obj->type == OBJT_DEAD ||
+ (swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0)) {
VM_OBJECT_RUNLOCK(obj);
continue;
}
@@ -2524,20 +2526,22 @@
kvo->kvo_memattr = obj->memattr;
kvo->kvo_active = 0;
kvo->kvo_inactive = 0;
- TAILQ_FOREACH(m, &obj->memq, listq) {
- /*
- * A page may belong to the object but be
- * dequeued and set to PQ_NONE while the
- * object lock is not held. This makes the
- * reads of m->queue below racy, and we do not
- * count pages set to PQ_NONE. However, this
- * sysctl is only meant to give an
- * approximation of the system anyway.
- */
- if (m->a.queue == PQ_ACTIVE)
- kvo->kvo_active++;
- else if (m->a.queue == PQ_INACTIVE)
- kvo->kvo_inactive++;
+ if (!swap_only) {
+ TAILQ_FOREACH(m, &obj->memq, listq) {
+ /*
+ * A page may belong to the object but be
+ * dequeued and set to PQ_NONE while the
+ * object lock is not held. This makes the
+ * reads of m->queue below racy, and we do not
+ * count pages set to PQ_NONE. However, this
+ * sysctl is only meant to give an
+ * approximation of the system anyway.
+ */
+ if (m->a.queue == PQ_ACTIVE)
+ kvo->kvo_active++;
+ else if (m->a.queue == PQ_INACTIVE)
+ kvo->kvo_inactive++;
+ }
}
kvo->kvo_vn_fileid = 0;
@@ -2547,7 +2551,10 @@
fullpath = "";
kvo->kvo_type = vm_object_kvme_type(obj, &vp);
if (vp != NULL) {
- vref(vp);
+ if (swap_only)
+ vp = NULL;
+ else
+ vref(vp);
} else if ((obj->flags & OBJ_ANON) != 0) {
MPASS(kvo->kvo_type == KVME_TYPE_DEFAULT ||
kvo->kvo_type == KVME_TYPE_SWAP);
@@ -2580,6 +2587,7 @@
kvo->kvo_structsize = roundup(kvo->kvo_structsize,
sizeof(uint64_t));
error = SYSCTL_OUT(req, kvo, kvo->kvo_structsize);
+ maybe_yield();
mtx_lock(&vm_object_list_mtx);
if (error)
break;
@@ -2588,10 +2596,28 @@
free(kvo, M_TEMP);
return (error);
}
+
+static int
+sysctl_vm_object_list(SYSCTL_HANDLER_ARGS)
+{
+ return (vm_object_list_handler(req, false));
+}
+
SYSCTL_PROC(_vm, OID_AUTO, objects, CTLTYPE_STRUCT | CTLFLAG_RW | CTLFLAG_SKIP |
CTLFLAG_MPSAFE, NULL, 0, sysctl_vm_object_list, "S,kinfo_vmobject",
"List of VM objects");
+static int
+sysctl_vm_object_list_swap(SYSCTL_HANDLER_ARGS)
+{
+ return (vm_object_list_handler(req, true));
+}
+
+SYSCTL_PROC(_vm, OID_AUTO, swap_objects,
+ CTLTYPE_STRUCT | CTLFLAG_RW | CTLFLAG_SKIP | CTLFLAG_MPSAFE, NULL, 0,
+ sysctl_vm_object_list_swap, "S,kinfo_vmobject",
+ "List of swap VM objects");
+
#include "opt_ddb.h"
#ifdef DDB
#include <sys/kernel.h>

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 1, 10:47 AM (20 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30675026
Default Alt Text
D31163.id92206.diff (3 KB)

Event Timeline