svn commit: r339497 - head/sys/kern

[Conrad Meyer]

Author: cem
Date: Sat Oct 20 21:49:44 2018
New Revision: 339497
URL: https://svnweb.freebsd.org/changeset/base/339497

Log:
  ZSTDIO: Correctly initialize zstd context with provided 'level'
  
  Prior to this revision, we allocated sufficient context space for 'level'
  but never actually set the compress level parameter, so we would always get
  the default '3'.
  
  Reviewed by:	markj, vangyzen
  MFC after:	12 hours
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D17144

Modified:
  head/sys/kern/subr_compressor.c

Modified: head/sys/kern/subr_compressor.c
==============================================================================
--- head/sys/kern/subr_compressor.c	Sat Oct 20 21:45:17 2018	(r339496)
+++ head/sys/kern/subr_compressor.c	Sat Oct 20 21:49:44 2018	(r339497)
@@ -275,8 +275,9 @@ zstdio_init(size_t maxiosize, int level)
 	ZSTD_CCtx *dump_compressor;
 	struct zstdio_stream *s;
 	void *wkspc, *owkspc, *buffer;
-	size_t wkspc_size, buf_size;
+	size_t wkspc_size, buf_size, rc;
 
+	s = NULL;
 	wkspc_size = ZSTD_estimateCStreamSize(level);
 	owkspc = wkspc = malloc(wkspc_size + 8, M_COMPRESS,
 	    M_WAITOK | M_NODUMP);
@@ -286,12 +287,23 @@ zstdio_init(size_t maxiosize, int level)
 
 	dump_compressor = ZSTD_initStaticCCtx(wkspc, wkspc_size);
 	if (dump_compressor == NULL) {
-		free(owkspc, M_COMPRESS);
 		printf("%s: workspace too small.\n", __func__);
-		return (NULL);
+		goto out;
 	}
 
-	(void)ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_checksumFlag, 1);
+	rc = ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_checksumFlag, 1);
+	if (ZSTD_isError(rc)) {
+		printf("%s: error setting checksumFlag: %s\n", __func__,
+		    ZSTD_getErrorName(rc));
+		goto out;
+	}
+	rc = ZSTD_CCtx_setParameter(dump_compressor, ZSTD_p_compressionLevel,
+	    level);
+	if (ZSTD_isError(rc)) {
+		printf("%s: error setting compressLevel: %s\n", __func__,
+		    ZSTD_getErrorName(rc));
+		goto out;
+	}
 
 	buf_size = ZSTD_CStreamOutSize() * 2;
 	buffer = malloc(buf_size, M_COMPRESS, M_WAITOK | M_NODUMP);
@@ -306,6 +318,9 @@ zstdio_init(size_t maxiosize, int level)
 
 	zstdio_reset(s);
 
+out:
+	if (s == NULL)
+		free(owkspc, M_COMPRESS);
 	return (s);
 }