Also release memory in vmem_seg_arena.

Remove debug printfs.

Author: lundman

module/spl/spl-kmem.c

@@ -3787,26 +3787,10 @@ struct free_slab {
 static list_t freelist;
 
 
-void fudge(kmem_cache_t *cp)
+void kmem_cache_build_slablist(kmem_cache_t *cp)
 {
 	int cpu_seqid;
 
-	printf("Releasing '%s'\n", cp->cache_name ? cp->cache_name : "(null)");
-
-	// lund
-
-	// release
-
-	// cache_magtype points to one of the array of magtype[], which is
-    // freed separately.
-	// kmem_magtype_t		*cache_magtype;				/* magazine type */
-	//cp->cache_magtype = NULL;
-
-	// kmem_maglist_t		cache_full;					/* full magazines */
-	// kmem_maglist_t		cache_empty;
-	// kmem_cpu_cache_t    cache_cpu[1];				/* per-cpu data */
-
-
     vmem_t *vmp = cp->cache_arena;
     kmem_slab_t *sp;
 	struct free_slab *fs;
@@ -3820,7 +3804,7 @@ void fudge(kmem_cache_t *cp)
 		fs->slab = (void *)P2ALIGN((uintptr_t)sp->slab_base, vmp->vm_quantum);
 		list_link_init(&fs->next);
 		list_insert_tail(&freelist, fs);
-		// leaking "sp"
+
     }
 
     for (sp = avl_first(&cp->cache_partial_slabs); sp != NULL;
@@ -3833,7 +3817,6 @@ void fudge(kmem_cache_t *cp)
 		list_link_init(&fs->next);
 		list_insert_tail(&freelist, fs);
 
-		// leaking "sp"
     }
 
 
@@ -3870,25 +3853,11 @@ kmem_cache_fini(int pass, int use_large_pages)
     mutex_enter(&kmem_cache_lock);
 	// lund
 
-#if 0
-	for(cp = list_head(&kmem_caches);
-		cp != NULL;
-		list_next(&kmem_caches, cp)) {
-
-		printf("Purging magazine '%s'\n",
-			   cp->cache_name ? cp->cache_name : "(null)");
-
-		mutex_exit(&kmem_cache_lock);
-		kmem_cache_magazine_purge(cp);
-		mutex_enter(&kmem_cache_lock);
-
-	}
-#endif
 
 	while((cp = list_head(&kmem_caches))) {
 			list_remove(&kmem_caches, cp);
 			mutex_exit(&kmem_cache_lock);
-			fudge(cp);
+			kmem_cache_build_slablist(cp);
 			mutex_enter(&kmem_cache_lock);
 	}
 
@@ -4256,32 +4225,20 @@ spl_kmem_fini(void)
 
 	kmem_cache_fini(2, /*use_large_pages*/ 0);
 
-	printf("A\n");
-
 	vmem_destroy(kmem_oversize_arena);
 
-	printf("B\n");
-
 	segkmem_zio_fini();
 
-	printf("C\n");
-
 	vmem_destroy(kmem_log_arena);
 	vmem_destroy(kmem_hash_arena);
 	vmem_destroy(kmem_cache_arena);
 	vmem_destroy(kmem_msb_arena);
 	vmem_destroy(kmem_metadata_arena);
 
-	printf("D\n");
-
 	kernelheap_fini();
 
-	printf("E\n");
-
 	list_destroy(&kmem_caches);
 
-	printf("F\n");
-
 	mutex_destroy(&kmem_cache_kstat_lock);
 	mutex_destroy(&kmem_flags_lock);
 	mutex_destroy(&kmem_cache_lock);

module/spl/spl-vmem.c

@@ -1861,13 +1861,53 @@ vmem_init(const char *heap_name,
 void vmem_fini(vmem_t *heap)
 {
 	uint32_t id;
-
+	vmem_t *vmp;
+	vmem_seg_t *seg;
 	/*
 
 	  We also need to release the slabs that vmem_populate() has allocated
 	  in the vmem_seg_arena here.
 
 	 */
+	vmp = vmem_seg_arena;
+	while (vmp->vm_nsegfree > 0)
+		vmem_putseg_global(vmem_getseg(vmp));
+
+	struct free_slab {
+		vmem_t *vmp;
+		size_t slabsize;
+		void *slab;
+		list_node_t next;
+	};
+
+	uint64_t i;
+	list_t freelist;
+	struct free_slab *fs;
+	list_create(&freelist, sizeof (struct free_slab),
+				offsetof(struct free_slab, next));
+
+
+	ssize_t nseg;
+	size_t size;
+	nseg = VMEM_MINFREE + vmem_populators * VMEM_POPULATE_RESERVE;
+	size = P2ROUNDUP(nseg *vmem_seg_size,vmem_seg_arena->vm_quantum);
+
+	while((seg = vmem_getseg_global()) ) {
+		uint64_t align;
+		align = (uint64_t)seg % size;
+		//printf("seg %p: align %u: start %p\n",
+		//	   seg, align , seg->vs_start);
+		if (!align) {
+
+			MALLOC(fs, struct free_slab *, sizeof(struct free_slab), M_TEMP, M_WAITOK);
+			fs->vmp = vmem_seg_arena;
+			fs->slabsize = size;
+			fs->slab = seg;
+			list_link_init(&fs->next);
+			list_insert_tail(&freelist, fs);
+
+		}
+	}
 
 	for (id = 0; id < 5; id++) {// From vmem_init, 5 vmem_create
 		vmem_xfree(vmem_vmem_arena, global_vmem_reap[id], sizeof (vmem_t));
@@ -1879,6 +1919,17 @@ void vmem_fini(vmem_t *heap)
 	vmem_destroy_internal(vmem_metadata_arena);
 	vmem_destroy_internal(heap);
 
+
+	i = 0;
+	while((fs = list_head(&freelist))) {
+		i+=fs->slabsize;
+		list_remove(&freelist, fs);
+		segkmem_free(fs->vmp, fs->slab, fs->slabsize);
+		FREE(fs, M_TEMP);
+	}
+	printf("Released %llu bytes from vmem_seg_arena\n", i);
+	list_destroy(&freelist);
+
 	mutex_destroy(&vmem_panic_lock);
 	mutex_destroy(&vmem_pushpage_lock);
 	mutex_destroy(&vmem_nosleep_lock);