From 4da8c7d11e6a7db5315a9fadabb359abc45f948e Mon Sep 17 00:00:00 2001 From: Volker Mauel Date: Thu, 7 Sep 2023 23:38:17 +0200 Subject: [PATCH 1/2] Intel QAT 1.7 compatibility Based on the intel QAT samples which are bundled in the 1.x drivers, this is the preferred approach since api version 1.6. See: https://www.intel.de/content/www/de/de/download/19734/intel-quickassist-technology-driver-for-linux-hw-version-1-x.html? Reviewed-by: Weigang Li Signed-off-by: Volker Mauel Closes #15190 --- module/os/linux/zfs/qat_compress.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/os/linux/zfs/qat_compress.c b/module/os/linux/zfs/qat_compress.c index 07d5d34dae..6d0595dd5f 100644 --- a/module/os/linux/zfs/qat_compress.c +++ b/module/os/linux/zfs/qat_compress.c @@ -193,7 +193,9 @@ qat_dc_init(void) sd.huffType = CPA_DC_HT_FULL_DYNAMIC; sd.sessDirection = CPA_DC_DIR_COMBINED; sd.sessState = CPA_DC_STATELESS; +#if (CPA_DC_API_VERSION_NUM_MAJOR == 1 && CPA_DC_API_VERSION_NUM_MINOR < 6) sd.deflateWindowSize = 7; +#endif sd.checksum = CPA_DC_ADLER32; status = cpaDcGetSessionSize(dc_inst_handles[i], &sd, &sess_size, &ctx_size); From 739db06ce7d453f92b93c9274e1f2176f927992d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 7 Sep 2023 16:11:33 -0700 Subject: [PATCH 2/2] Tag 2.2.0-rc4 Signed-off-by: Brian Behlendorf --- META | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/META b/META index e4e770026b..0953cc5192 100644 --- a/META +++ b/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.2.0 -Release: rc3 +Release: rc4 Release-Tags: relext License: CDDL Author: OpenZFS