Module Name: src
Committed By: maxv
Date: Mon Oct 28 09:00:08 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.c nvmm_ioctl.h
Log Message:
Add nram in struct nvmm_ctl_mach_info.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/nvmm/nvmm_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.24 src/sys/dev/nvmm/nvmm.c:1.25
--- src/sys/dev/nvmm/nvmm.c:1.24 Sun Oct 27 20:17:36 2019
+++ src/sys/dev/nvmm/nvmm.c Mon Oct 28 09:00:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.24 2019/10/27 20:17:36 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.25 2019/10/28 09:00:08 maxv Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.24 2019/10/27 20:17:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.25 2019/10/28 09:00:08 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -915,6 +915,14 @@ nvmm_ctl_mach_info(struct nvmm_owner *ow
ctl.nvcpus++;
nvmm_vcpu_put(vcpu);
}
+
+ ctl.nram = 0;
+ for (i = 0; i < NVMM_MAX_HMAPPINGS; i++) {
+ if (!mach->hmap[i].present)
+ continue;
+ ctl.nram += mach->hmap[i].size;
+ }
+
ctl.pid = mach->owner->pid;
ctl.time = mach->time;
Index: src/sys/dev/nvmm/nvmm_ioctl.h
diff -u src/sys/dev/nvmm/nvmm_ioctl.h:1.8 src/sys/dev/nvmm/nvmm_ioctl.h:1.9
--- src/sys/dev/nvmm/nvmm_ioctl.h:1.8 Wed Oct 23 07:01:11 2019
+++ src/sys/dev/nvmm/nvmm_ioctl.h Mon Oct 28 09:00:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_ioctl.h,v 1.8 2019/10/23 07:01:11 maxv Exp $ */
+/* $NetBSD: nvmm_ioctl.h,v 1.9 2019/10/28 09:00:08 maxv Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -122,7 +122,8 @@ struct nvmm_ioc_gpa_unmap {
struct nvmm_ctl_mach_info {
nvmm_machid_t machid;
- size_t nvcpus;
+ uint32_t nvcpus;
+ uint64_t nram;
pid_t pid;
time_t time;
};
