nvmm: Port to DragonFly DragonFlyBSD#7: memory allocation

liweitianux · liweitianux · commit bdcc0ba07a70 · 2021-07-21T07:28:20.000+08:00
Add compat code to adapt NetBSD's kmem_alloc()/kmem_zalloc()/kmem_free().
diff --git a/sys/dev/virtual/nvmm/nvmm.c b/sys/dev/virtual/nvmm/nvmm.c
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.22.2.7 2020/08/29 17:00:28 martin Exp $")
 #include <dev/nvmm/nvmm_internal.h>
 #include <dev/nvmm/nvmm_ioctl.h>
 
+MALLOC_DEFINE(M_NVMM, "nvmm", "NVMM data");
+
 static struct nvmm_machine machines[NVMM_MAX_MACHINES];
 static volatile unsigned int nmachines __cacheline_aligned;
 
diff --git a/sys/dev/virtual/nvmm/nvmm_compat.h b/sys/dev/virtual/nvmm/nvmm_compat.h
@@ -44,6 +44,7 @@
 #include <sys/param.h>
 #include <sys/bitops.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/systm.h>
 
 #include <machine/cpufunc.h>
@@ -262,4 +263,24 @@ typedef enum krw_t {
 #define rw_exit(lock)		lockmgr(lock, LK_RELEASE)
 #define rw_write_held(lock)	(lockstatus(lock, curthread) == LK_EXCLUSIVE)
 
+/*
+ * Memory allocation
+ */
+MALLOC_DECLARE(M_NVMM);
+enum {
+	KM_SLEEP   = M_WAITOK,
+	KM_NOSLEEP = M_NOWAIT,
+};
+#define kmem_alloc(size, flags) \
+	({								\
+		KKASSERT((flags & ~(KM_SLEEP|KM_NOSLEEP)) == 0);	\
+		kmalloc(size, M_NVMM, flags);				\
+	})
+#define kmem_zalloc(size, flags) \
+	({								\
+		KKASSERT((flags & ~(KM_SLEEP|KM_NOSLEEP)) == 0);	\
+		kmalloc(size, M_NVMM, flags|M_ZERO);			\
+	})
+#define kmem_free(data, size)	kfree(data, M_NVMM)
+
 #endif /* _NVMM_COMPAT_H_ */
