From: Chenghai Huang <huangchenghai2@huawei.com> 1.When determining whether the output size meets the threshold requirements, only compression needs to consider the length of the head size. 2.check_store_buf will not return value less than 0. 3.msg will not be null, because it is a local variable in wd_comp. Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com> --- drv/hisi_comp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drv/hisi_comp.c b/drv/hisi_comp.c index 98b45d71..0c36301d 100644 --- a/drv/hisi_comp.c +++ b/drv/hisi_comp.c @@ -343,15 +343,14 @@ static int check_enable_store_buf(struct wd_comp_msg *msg, __u32 out_size, int h if (msg->stream_mode != WD_COMP_STATEFUL) return 0; - if (msg->stream_pos != WD_COMP_STREAM_NEW && out_size > SW_STOREBUF_TH) - return 0; + if (msg->stream_pos == WD_COMP_STREAM_NEW && msg->req.op_type == WD_DIR_COMPRESS && + out_size - head_size <= SW_STOREBUF_TH) + return 1; - if (msg->stream_pos == WD_COMP_STREAM_NEW && - out_size - head_size > SW_STOREBUF_TH) - return 0; + if (out_size <= SW_STOREBUF_TH) + return 1; - /* 1 mean it need store buf */ - return 1; + return 0; } static void fill_buf_size_deflate(struct hisi_zip_sqe *sqe, __u32 in_size, @@ -386,7 +385,7 @@ static int fill_buf_deflate_generic(struct hisi_zip_sqe *sqe, /* * When the output buffer is smaller than the SW_STOREBUF_TH in STATEFUL, - * the internal buffer is used. + * the internal buffer is used. It requires a storage buffer when returning 1. */ ret = check_enable_store_buf(msg, out_size, head_size); if (ret) { @@ -524,7 +523,7 @@ static int fill_buf_deflate_sgl_generic(handle_t h_qp, struct hisi_zip_sqe *sqe, /* * When the output buffer is smaller than the SW_STOREBUF_TH in STATEFUL, - * the internal buffer is used. + * the internal buffer is used. It requires a storage buffer when returning 1. */ ret = check_enable_store_buf(msg, out_size, head_size); if (ret) { @@ -1152,7 +1151,7 @@ static int hisi_zip_comp_send(struct wd_alg_driver *drv, handle_t ctx, void *com /* Skip hardware, if the store buffer need to be copied to output */ ret = check_store_buf(msg); if (ret) - return ret < 0 ? ret : 0; + return 0; hisi_set_msg_id(h_qp, &msg->tag); ret = fill_zip_comp_sqe(qp, msg, &sqe); @@ -1322,7 +1321,7 @@ static int hisi_zip_comp_recv(struct wd_alg_driver *drv, handle_t ctx, void *com __u16 count = 0; int ret; - if (recv_msg && recv_msg->ctx_buf) { + if (recv_msg->ctx_buf) { buf = (struct hisi_comp_buf *)(recv_msg->ctx_buf + CTX_STOREBUF_OFFSET); /* * The output has been copied from the storage buffer, -- 2.33.0