Clean up hashtable frees to fix rmmod crash on redhat

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 3562165..7b3a32b 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -11,8 +11,9 @@
 #define V3_CREATE_GUEST 12
 #define V3_FREE_GUEST 13
 
-#define V3_ADD_MEMORY 50
-#define V3_RESET_MEMORY 51
+#define V3_ADD_MEMORY    50
+#define V3_RESET_MEMORY  51
+#define V3_REMOVE_MEMORY 52
 
 #define V3_ADD_PCI_HW_DEV 55
 #define V3_ADD_PCI_USER_DEV 56
@@ -52,9 +53,18 @@ struct v3_guest_img {
     char name[128];
 } __attribute__((packed));
 
+typedef enum { PREALLOCATED=0,          // user space-allocated (e.g. hot remove)
+             REQUESTED,               // kernel will attempt allocation (anywhere)
+             REQUESTED32,             // kernel will attempt allocation (<4GB)
+
+} v3_mem_region_type_t;
+
 struct v3_mem_region {
-    unsigned long long base_addr;
-    unsigned long long num_pages;
+    v3_mem_region_type_t type;         // 
+    int                  node;         // numa node for REQUESTED (-1 = any)
+    unsigned long long   base_addr;    // region start (hpa) for PREALLOCATED
+    unsigned long long   num_pages;    // size for PREALLOCATED or request size for REQUESTED
+                                       // should be power of 2 and > V3_CONFIG_MEM_BLOCK
 } __attribute__((packed));
 
 struct v3_debug_cmd {
@@ -131,14 +141,12 @@ struct proc_dir_entry *palacios_get_procdir(void);
 // The idea is that everything uses the same stubs
 void  palacios_print_scoped(void *vm, int vcore, const char *fmt, ...);
 #define palacios_print(...) palacios_print_scoped(0,-1, __VA_ARGS__)
-void *palacios_allocate_pages(int num_pages, unsigned int alignment);
+// node_id=-1 => no node constraint
+void *palacios_allocate_pages(int num_pages, unsigned int alignment, int node_id, int constraints);
 void  palacios_free_pages(void *page_addr, int num_pages);
 void *palacios_alloc(unsigned int size);
-void *palacios_alloc_extended(unsigned int size, unsigned int flags);
-// FIX
-// NEED A palacios_alloc_node wrapper
-//
-#define palacios_alloc_node_extended(size, flags, node) kmalloc_node(size,flags,node)
+// node_id=-1 => no node constraint
+void *palacios_alloc_extended(unsigned int size, unsigned int flags, int node_id);
 void  palacios_free(void *);
 void *palacios_valloc(unsigned int size); // use instead of vmalloc
 void  palacios_vfree(void *);             // use instead of vfree