c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix QAT allocation failure return value

Browse Source 
When qat_compress() fails to allocate the required contiguous memory
it mistakenly returns success.  This prevents the fallback software
compression from taking over and (un)compressing the block.

Resolve the issue by correctly setting the local 'status' variable
on all exit paths.  Furthermore, initialize it to CPA_STATUS_FAIL
to ensure qat_compress() always fails safe to guard against any
similar bugs in the future.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9784
Closes #9788
This commit is contained in:
Brian Behlendorf 2020-01-06 11:17:53 -08:00 committed by GitHub
parent 581ca28169
commit bc9cef11fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
module/os/linux/zfs/qat_compress.c
View File

@ -248,7 +248,7 @@ qat_compress_impl(qat_compress_dir_t dir, char *src, int src_len,
Cpa8U *buffer_meta_dst = NULL; Cpa8U *buffer_meta_dst = NULL;
Cpa32U buffer_meta_size = 0; Cpa32U buffer_meta_size = 0;
CpaDcRqResults dc_results; CpaDcRqResults dc_results;
CpaStatus status = CPA_STATUS_SUCCESS; CpaStatus status = CPA_STATUS_FAIL;
Cpa32U hdr_sz = 0; Cpa32U hdr_sz = 0;
Cpa32U compressed_sz; Cpa32U compressed_sz;
Cpa32U num_src_buf = (src_len >> PAGE_SHIFT) + 2; Cpa32U num_src_buf = (src_len >> PAGE_SHIFT) + 2;
@ -277,16 +277,19 @@ qat_compress_impl(qat_compress_dir_t dir, char *src, int src_len,
Cpa32U dst_buffer_list_mem_size = sizeof (CpaBufferList) + Cpa32U dst_buffer_list_mem_size = sizeof (CpaBufferList) +
((num_dst_buf + num_add_buf) * sizeof (CpaFlatBuffer)); ((num_dst_buf + num_add_buf) * sizeof (CpaFlatBuffer));
if (QAT_PHYS_CONTIG_ALLOC(&in_pages, status = QAT_PHYS_CONTIG_ALLOC(&in_pages,
num_src_buf * sizeof (struct page *)) != CPA_STATUS_SUCCESS) num_src_buf * sizeof (struct page *));
if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
if (QAT_PHYS_CONTIG_ALLOC(&out_pages, status = QAT_PHYS_CONTIG_ALLOC(&out_pages,
num_dst_buf * sizeof (struct page *)) != CPA_STATUS_SUCCESS) num_dst_buf * sizeof (struct page *));
if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
if (QAT_PHYS_CONTIG_ALLOC(&add_pages, status = QAT_PHYS_CONTIG_ALLOC(&add_pages,
num_add_buf * sizeof (struct page *)) != CPA_STATUS_SUCCESS) num_add_buf * sizeof (struct page *));
if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
i = (Cpa32U)atomic_inc_32_nv(&inst_num) % num_inst; i = (Cpa32U)atomic_inc_32_nv(&inst_num) % num_inst;
@ -295,19 +298,19 @@ qat_compress_impl(qat_compress_dir_t dir, char *src, int src_len,
cpaDcBufferListGetMetaSize(dc_inst_handle, num_src_buf, cpaDcBufferListGetMetaSize(dc_inst_handle, num_src_buf,
&buffer_meta_size); &buffer_meta_size);
if (QAT_PHYS_CONTIG_ALLOC(&buffer_meta_src, buffer_meta_size) != status = QAT_PHYS_CONTIG_ALLOC(&buffer_meta_src, buffer_meta_size);
CPA_STATUS_SUCCESS) if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
cpaDcBufferListGetMetaSize(dc_inst_handle, num_dst_buf + num_add_buf, cpaDcBufferListGetMetaSize(dc_inst_handle, num_dst_buf + num_add_buf,
&buffer_meta_size); &buffer_meta_size);
if (QAT_PHYS_CONTIG_ALLOC(&buffer_meta_dst, buffer_meta_size) != status = QAT_PHYS_CONTIG_ALLOC(&buffer_meta_dst, buffer_meta_size);
CPA_STATUS_SUCCESS) if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
/* build source buffer list */ /* build source buffer list */
if (QAT_PHYS_CONTIG_ALLOC(&buf_list_src, src_buffer_list_mem_size) != status = QAT_PHYS_CONTIG_ALLOC(&buf_list_src, src_buffer_list_mem_size);
CPA_STATUS_SUCCESS) if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
flat_buf_src = (CpaFlatBuffer *)(buf_list_src + 1); flat_buf_src = (CpaFlatBuffer *)(buf_list_src + 1);
@ -315,8 +318,8 @@ qat_compress_impl(qat_compress_dir_t dir, char *src, int src_len,
buf_list_src->pBuffers = flat_buf_src; /* always point to first one */ buf_list_src->pBuffers = flat_buf_src; /* always point to first one */
/* build destination buffer list */ /* build destination buffer list */
if (QAT_PHYS_CONTIG_ALLOC(&buf_list_dst, dst_buffer_list_mem_size) != status = QAT_PHYS_CONTIG_ALLOC(&buf_list_dst, dst_buffer_list_mem_size);
CPA_STATUS_SUCCESS) if (status != CPA_STATUS_SUCCESS)
goto fail; goto fail;
flat_buf_dst = (CpaFlatBuffer *)(buf_list_dst + 1); flat_buf_dst = (CpaFlatBuffer *)(buf_list_dst + 1);