[PATCH v15 10/21] compress/zsda: add compression algo match

Hanxiao Li li.hanxiao at zte.com.cn
Fri Oct 25 16:10:33 CEST 2024


Add compression algo match functions, in order to
distinguish compression and decompression

Signed-off-by: Hanxiao Li <li.hanxiao at zte.com.cn>
---
 drivers/common/zsda/meson.build   |  12 +-
 drivers/compress/zsda/zsda_comp.c | 232 ++++++++++++++++++++++++++++++
 drivers/compress/zsda/zsda_comp.h |  44 ++++++
 3 files changed, 287 insertions(+), 1 deletion(-)
 create mode 100644 drivers/compress/zsda/zsda_comp.c
 create mode 100644 drivers/compress/zsda/zsda_comp.h

diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index a4859523e2..3eca11b19b 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -7,10 +7,20 @@ if is_windows
     subdir_done()
 endif
 
-deps += ['bus_pci', 'mbuf']
+deps += ['bus_pci', 'mbuf', 'compressdev']
 sources += files(
 		'zsda_logs.c',
 		'zsda_common.c',
 		'zsda_device.c',
 		'zsda_qp.c',
 		)
+
+zsda_compress = true
+zsda_compress_path = 'compress/zsda'
+zsda_compress_relpath = '../../' + zsda_compress_path
+includes += include_directories(zsda_compress_relpath)
+if zsda_compress
+	foreach f: ['zsda_comp.c']
+		sources += files(join_paths(zsda_compress_relpath, f))
+	endforeach
+endif
diff --git a/drivers/compress/zsda/zsda_comp.c b/drivers/compress/zsda/zsda_comp.c
new file mode 100644
index 0000000000..9f1b237c1f
--- /dev/null
+++ b/drivers/compress/zsda/zsda_comp.c
@@ -0,0 +1,232 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include "zsda_comp.h"
+
+#define ZLIB_HEADER_SIZE 2
+#define ZLIB_TRAILER_SIZE 4
+#define GZIP_HEADER_SIZE 10
+#define GZIP_TRAILER_SIZE 8
+
+int
+zsda_comp_match(const void *op_in)
+{
+	const struct rte_comp_op *op = op_in;
+	const struct zsda_comp_xform *xform = op->private_xform;
+
+	if (op->op_type != RTE_COMP_OP_STATELESS)
+		return 0;
+
+	if (xform->type != RTE_COMP_COMPRESS)
+		return 0;
+
+	return 1;
+}
+
+static uint8_t
+get_opcode(const struct zsda_comp_xform *xform)
+{
+	if (xform->type == RTE_COMP_COMPRESS) {
+		if (xform->checksum_type == RTE_COMP_CHECKSUM_NONE ||
+			xform->checksum_type == RTE_COMP_CHECKSUM_CRC32)
+			return ZSDA_OPC_COMP_GZIP;
+		else if (xform->checksum_type == RTE_COMP_CHECKSUM_ADLER32)
+			return ZSDA_OPC_COMP_ZLIB;
+	}
+	if (xform->type == RTE_COMP_DECOMPRESS) {
+		if (xform->checksum_type == RTE_COMP_CHECKSUM_CRC32 ||
+			xform->checksum_type == RTE_COMP_CHECKSUM_NONE)
+			return ZSDA_OPC_DECOMP_GZIP;
+		else if (xform->checksum_type == RTE_COMP_CHECKSUM_ADLER32)
+			return ZSDA_OPC_DECOMP_ZLIB;
+	}
+
+	return ZSDA_OPC_INVALID;
+}
+
+int
+zsda_build_comp_request(void *op_in, const struct zsda_queue *queue,
+		   void **op_cookies, const uint16_t new_tail)
+{
+	struct rte_comp_op *op = op_in;
+	struct zsda_comp_xform *xform = op->private_xform;
+	struct zsda_wqe_comp *wqe =
+		(struct zsda_wqe_comp *)(queue->base_addr +
+					 (new_tail * queue->msg_size));
+
+	struct zsda_op_cookie *cookie = op_cookies[new_tail];
+	struct zsda_sgl *sgl_src = (struct zsda_sgl *)&cookie->sgl_src;
+	struct zsda_sgl *sgl_dst = (struct zsda_sgl *)&cookie->sgl_dst;
+	struct comp_head_info comp_head_info;
+
+	uint8_t opcode;
+	int ret;
+	uint32_t op_offset;
+	uint32_t op_src_len;
+	uint32_t op_dst_len;
+	uint32_t head_len;
+
+	if ((op->m_dst == NULL) || (op->m_dst == op->m_src)) {
+		ZSDA_LOG(ERR, "Failed! m_dst");
+		return -EINVAL;
+	}
+
+	opcode = get_opcode(xform);
+	if (opcode == ZSDA_OPC_INVALID) {
+		ZSDA_LOG(ERR, E_CONFIG);
+		return -EINVAL;
+	}
+
+	cookie->used = true;
+	cookie->sid = new_tail;
+	cookie->op = op;
+
+	if (opcode == ZSDA_OPC_COMP_GZIP)
+		head_len = GZIP_HEADER_SIZE;
+	else if (opcode == ZSDA_OPC_COMP_ZLIB)
+		head_len = ZLIB_HEADER_SIZE;
+	else {
+		ZSDA_LOG(ERR, "Comp, op_code error!");
+		return -EINVAL;
+	}
+
+	comp_head_info.head_len = head_len;
+	comp_head_info.head_phys_addr = cookie->comp_head_phys_addr;
+
+	op_offset = op->src.offset;
+	op_src_len = op->src.length;
+	ret = zsda_fill_sgl(op->m_src, op_offset, sgl_src,
+				   cookie->sgl_src_phys_addr, op_src_len, NULL);
+
+	op_offset = op->dst.offset;
+	op_dst_len = op->m_dst->pkt_len - op_offset;
+	op_dst_len += head_len;
+	ret |= zsda_fill_sgl(op->m_dst, op_offset, sgl_dst,
+					cookie->sgl_dst_phys_addr, op_dst_len,
+					&comp_head_info);
+
+	if (ret) {
+		ZSDA_LOG(ERR, E_FUNC);
+		return ret;
+	}
+
+	memset(wqe, 0, sizeof(struct zsda_wqe_comp));
+	wqe->rx_length = op_src_len;
+	wqe->tx_length = op_dst_len;
+	wqe->valid = queue->valid;
+	wqe->op_code = opcode;
+	wqe->sid = cookie->sid;
+	wqe->rx_sgl_type = SGL_ELM_TYPE_LIST;
+	wqe->tx_sgl_type = SGL_ELM_TYPE_LIST;
+
+	wqe->rx_addr = cookie->sgl_src_phys_addr;
+	wqe->tx_addr = cookie->sgl_dst_phys_addr;
+
+	return ret;
+}
+
+int
+zsda_decomp_match(const void *op_in)
+{
+	const struct rte_comp_op *op = op_in;
+	const struct zsda_comp_xform *xform = op->private_xform;
+
+	if (op->op_type != RTE_COMP_OP_STATELESS)
+		return 0;
+
+	if (xform->type != RTE_COMP_DECOMPRESS)
+		return 0;
+	return 1;
+}
+
+int
+zsda_build_decomp_request(void *op_in, const struct zsda_queue *queue,
+			 void **op_cookies, const uint16_t new_tail)
+{
+	struct rte_comp_op *op = op_in;
+	struct zsda_comp_xform *xform = op->private_xform;
+
+	struct zsda_wqe_comp *wqe =
+		(struct zsda_wqe_comp *)(queue->base_addr +
+					 (new_tail * queue->msg_size));
+	struct zsda_op_cookie *cookie = op_cookies[new_tail];
+	struct zsda_sgl *sgl_src = (struct zsda_sgl *)&cookie->sgl_src;
+	struct zsda_sgl *sgl_dst = (struct zsda_sgl *)&cookie->sgl_dst;
+	uint8_t opcode;
+	int ret;
+
+	uint32_t op_offset;
+	uint32_t op_src_len;
+	uint32_t op_dst_len;
+
+	uint8_t *head_data;
+	uint16_t head_len;
+	struct comp_head_info comp_head_info;
+	uint8_t head_zlib[ZLIB_HEADER_SIZE] = {0x78, 0xDA};
+	uint8_t head_gzip[GZIP_HEADER_SIZE] = {0x1F, 0x8B, 0x08, 0x00, 0x00,
+						   0x00, 0x00, 0x00, 0x00, 0x03};
+
+	if ((op->m_dst == NULL) || (op->m_dst == op->m_src)) {
+		ZSDA_LOG(ERR, "Failed! m_dst");
+		return -EINVAL;
+	}
+
+	opcode = get_opcode(xform);
+	if (opcode == ZSDA_OPC_INVALID) {
+		ZSDA_LOG(ERR, E_CONFIG);
+		return -EINVAL;
+	}
+
+	cookie->used = true;
+	cookie->sid = new_tail;
+	cookie->op = op;
+
+	if (opcode == ZSDA_OPC_DECOMP_GZIP) {
+		head_data = head_gzip;
+		head_len = GZIP_HEADER_SIZE;
+	} else if (opcode == ZSDA_OPC_DECOMP_ZLIB) {
+		head_data = head_zlib;
+		head_len = ZLIB_HEADER_SIZE;
+	} else {
+		ZSDA_LOG(ERR, "Comp, op_code error!");
+		return -EINVAL;
+	}
+
+	op_offset = op->src.offset;
+	op_src_len = op->src.length;
+	op_src_len += head_len;
+	comp_head_info.head_len = head_len;
+	comp_head_info.head_phys_addr = cookie->comp_head_phys_addr;
+	cookie->decomp_no_tail = true;
+	for (int i = 0; i < head_len; i++)
+		cookie->comp_head[i] = head_data[i];
+
+	ret = zsda_fill_sgl(op->m_src, op_offset, sgl_src,
+				cookie->sgl_src_phys_addr, op_src_len,
+				&comp_head_info);
+
+	op_offset = op->dst.offset;
+	op_dst_len = op->m_dst->pkt_len - op_offset;
+	ret |= zsda_fill_sgl(op->m_dst, op_offset, sgl_dst,
+				 cookie->sgl_dst_phys_addr, op_dst_len, NULL);
+
+	if (ret) {
+		ZSDA_LOG(ERR, E_FUNC);
+		return ret;
+	}
+
+	memset(wqe, 0, sizeof(struct zsda_wqe_comp));
+
+	wqe->rx_length = op_src_len;
+	wqe->tx_length = op_dst_len;
+	wqe->valid = queue->valid;
+	wqe->op_code = opcode;
+	wqe->sid = cookie->sid;
+	wqe->rx_sgl_type = SGL_ELM_TYPE_LIST;
+	wqe->tx_sgl_type = SGL_ELM_TYPE_LIST;
+	wqe->rx_addr = cookie->sgl_src_phys_addr;
+	wqe->tx_addr = cookie->sgl_dst_phys_addr;
+
+	return ret;
+}
diff --git a/drivers/compress/zsda/zsda_comp.h b/drivers/compress/zsda/zsda_comp.h
new file mode 100644
index 0000000000..8a4dd29865
--- /dev/null
+++ b/drivers/compress/zsda/zsda_comp.h
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#ifndef _ZSDA_COMP_H_
+#define _ZSDA_COMP_H_
+
+#include <rte_compressdev.h>
+
+#include "zsda_common.h"
+#include "zsda_device.h"
+#include "zsda_qp.h"
+
+struct zsda_comp_xform {
+	enum rte_comp_xform_type type;
+	enum rte_comp_checksum_type checksum_type;
+};
+
+struct compress_cfg {
+} __rte_packed;
+
+struct zsda_wqe_comp {
+	uint8_t valid;
+	uint8_t op_code;
+	uint16_t sid;
+	uint8_t resv[3];
+	uint8_t rx_sgl_type : 4;
+	uint8_t tx_sgl_type : 4;
+	uint64_t rx_addr;
+	uint32_t rx_length;
+	uint64_t tx_addr;
+	uint32_t tx_length;
+	struct compress_cfg cfg;
+} __rte_packed;
+
+int zsda_comp_match(const void *op_in);
+int zsda_build_comp_request(void *op_in, const struct zsda_queue *queue,
+		       void **op_cookies, const uint16_t new_tail);
+int zsda_decomp_match(const void *op_in);
+int zsda_build_decomp_request(void *op_in, const struct zsda_queue *queue,
+			 void **op_cookies, const uint16_t new_tail);
+int zsda_comp_callback(void *cookie_in, struct zsda_cqe *cqe);
+
+#endif /* _ZSDA_COMP_H_ */
-- 
2.27.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mails.dpdk.org/archives/dev/attachments/20241025/7b0f24fb/attachment-0001.htm>


More information about the dev mailing list