svn commit: r354365 - stable/12/sys/cddl/contrib/opensolaris/uts/common/zmod

[Alexander Motin]

Author: mav
Date: Tue Nov  5 19:14:17 2019
New Revision: 354365
URL: https://svnweb.freebsd.org/changeset/base/354365

Log:
  MFC r354159: FreeBSD'fy ZFS zlib zalloc/zfree callbacks.
  
  The previous code came from OpenSolaris, which in my understanding require
  allocation size to be known to free memory.  To store that size previous
  code allocated additional 8 byte header.  But I have noticed that zlib
  with present settings allocates 64KB context buffers for each call, that
  could be efficiently cached by UMA, but addition of those 8 bytes makes
  them fall back to physical RAM allocations, that cause huge overhead and
  lock congestion on small blocks.  Since FreeBSD's free() does not have
  the size argument, switching to it solves the problem, increasing write
  speed to ZVOLs with 4KB block size and GZIP compression on my 40-threads
  test system from ~60MB/s to ~600MB/s.

Modified:
  stable/12/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c
==============================================================================
--- stable/12/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c	Tue Nov  5 18:35:13 2019	(r354364)
+++ stable/12/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c	Tue Nov  5 19:14:17 2019	(r354365)
@@ -28,41 +28,23 @@
 
 #include <sys/systm.h>
 #include <sys/cmn_err.h>
-#include <sys/kobj.h>
+#include <sys/kmem.h>
 
-struct zchdr {
-	uint_t zch_magic;
-	uint_t zch_size;
-};
-
-#define	ZCH_MAGIC	0x3cc13cc1
-
 /*ARGSUSED*/
 void *
 zcalloc(void *opaque, uint_t items, uint_t size)
 {
-	size_t nbytes = sizeof (struct zchdr) + items * size;
-	struct zchdr *z = kobj_zalloc(nbytes, KM_NOWAIT|KM_TMP);
+	void *ptr;
 
-	if (z == NULL)
-		return (NULL);
-
-	z->zch_magic = ZCH_MAGIC;
-	z->zch_size = nbytes;
-
-	return (z + 1);
+	ptr = malloc((size_t)items * size, M_SOLARIS, M_NOWAIT);
+	return ptr;
 }
 
 /*ARGSUSED*/
 void
 zcfree(void *opaque, void *ptr)
 {
-	struct zchdr *z = ((struct zchdr *)ptr) - 1;
-
-	if (z->zch_magic != ZCH_MAGIC)
-		panic("zcfree region corrupt: hdr=%p ptr=%p", (void *)z, ptr);
-
-	kobj_free(z, z->zch_size);
+	free(ptr, M_SOLARIS);
 }
 
 void