eeded2044a
Let's try to enforce the convention where most drivers use a pmd. logtype with their class reflected in it, and libraries use a lib. logtype. Introduce two new macros: - RTE_LOG_REGISTER_DEFAULT can be used when a single logtype is used in a component. It is associated to the default name provided by the build system, - RTE_LOG_REGISTER_SUFFIX can be used when multiple logtypes are used, and then the passed name is appended to the default name, RTE_LOG_REGISTER is left untouched for existing external users and for components that do not comply with the convention. There is a new Meson variable log_prefix to adapt the default name for baseband (pmd.bb.), bus (no pmd.) and mempool (no pmd.) classes. Note: achieved with below commands + reverted change on net/bonding + edits on crypto/virtio, compress/mlx5, regex/mlx5 $ git grep -l RTE_LOG_REGISTER drivers/ | while read file; do pattern=${file##drivers/}; class=${pattern%%/*}; pattern=${pattern#$class/}; drv=${pattern%%/*}; case "$class" in baseband) pattern=pmd.bb.$drv;; bus) pattern=bus.$drv;; mempool) pattern=mempool.$drv;; *) pattern=pmd.$class.$drv;; esac sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file; done $ git grep -l RTE_LOG_REGISTER lib/ | while read file; do pattern=${file##lib/}; pattern=lib.${pattern%%/*}; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file; done Signed-off-by: David Marchand <david.marchand@redhat.com> Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
430 lines
10 KiB
C
430 lines
10 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2018 Cavium Networks
|
|
*/
|
|
|
|
#include <rte_bus_vdev.h>
|
|
#include <rte_common.h>
|
|
|
|
#include "zlib_pmd_private.h"
|
|
|
|
/** Compute next mbuf in the list, assign data buffer and length,
|
|
* returns 0 if mbuf is NULL
|
|
*/
|
|
#define COMPUTE_BUF(mbuf, data, len) \
|
|
((mbuf = mbuf->next) ? \
|
|
(data = rte_pktmbuf_mtod(mbuf, uint8_t *)), \
|
|
(len = rte_pktmbuf_data_len(mbuf)) : 0)
|
|
|
|
static void
|
|
process_zlib_deflate(struct rte_comp_op *op, z_stream *strm)
|
|
{
|
|
int ret, flush, fin_flush;
|
|
struct rte_mbuf *mbuf_src = op->m_src;
|
|
struct rte_mbuf *mbuf_dst = op->m_dst;
|
|
|
|
switch (op->flush_flag) {
|
|
case RTE_COMP_FLUSH_FULL:
|
|
case RTE_COMP_FLUSH_FINAL:
|
|
fin_flush = Z_FINISH;
|
|
break;
|
|
default:
|
|
op->status = RTE_COMP_OP_STATUS_INVALID_ARGS;
|
|
ZLIB_PMD_ERR("Invalid flush value\n");
|
|
return;
|
|
}
|
|
|
|
if (unlikely(!strm)) {
|
|
op->status = RTE_COMP_OP_STATUS_INVALID_ARGS;
|
|
ZLIB_PMD_ERR("Invalid z_stream\n");
|
|
return;
|
|
}
|
|
/* Update z_stream with the inputs provided by application */
|
|
strm->next_in = rte_pktmbuf_mtod_offset(mbuf_src, uint8_t *,
|
|
op->src.offset);
|
|
|
|
strm->avail_in = rte_pktmbuf_data_len(mbuf_src) - op->src.offset;
|
|
|
|
strm->next_out = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
|
|
op->dst.offset);
|
|
|
|
strm->avail_out = rte_pktmbuf_data_len(mbuf_dst) - op->dst.offset;
|
|
|
|
/* Set flush value to NO_FLUSH unless it is last mbuf */
|
|
flush = Z_NO_FLUSH;
|
|
/* Initialize status to SUCCESS */
|
|
op->status = RTE_COMP_OP_STATUS_SUCCESS;
|
|
|
|
do {
|
|
/* Set flush value to Z_FINISH for last block */
|
|
if ((op->src.length - strm->total_in) <= strm->avail_in) {
|
|
strm->avail_in = (op->src.length - strm->total_in);
|
|
flush = fin_flush;
|
|
}
|
|
do {
|
|
ret = deflate(strm, flush);
|
|
if (unlikely(ret == Z_STREAM_ERROR)) {
|
|
/* error return, do not process further */
|
|
op->status = RTE_COMP_OP_STATUS_ERROR;
|
|
goto def_end;
|
|
}
|
|
/* Break if Z_STREAM_END is encountered */
|
|
if (ret == Z_STREAM_END)
|
|
goto def_end;
|
|
|
|
/* Keep looping until input mbuf is consumed.
|
|
* Exit if destination mbuf gets exhausted.
|
|
*/
|
|
} while ((strm->avail_out == 0) &&
|
|
COMPUTE_BUF(mbuf_dst, strm->next_out, strm->avail_out));
|
|
|
|
if (!strm->avail_out) {
|
|
/* there is no space for compressed output */
|
|
op->status = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
|
|
break;
|
|
}
|
|
|
|
/* Update source buffer to next mbuf
|
|
* Exit if input buffers are fully consumed
|
|
*/
|
|
} while (COMPUTE_BUF(mbuf_src, strm->next_in, strm->avail_in));
|
|
|
|
def_end:
|
|
/* Update op stats */
|
|
switch (op->status) {
|
|
case RTE_COMP_OP_STATUS_SUCCESS:
|
|
op->consumed += strm->total_in;
|
|
/* Fall-through */
|
|
case RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED:
|
|
op->produced += strm->total_out;
|
|
break;
|
|
default:
|
|
ZLIB_PMD_ERR("stats not updated for status:%d\n",
|
|
op->status);
|
|
}
|
|
|
|
deflateReset(strm);
|
|
}
|
|
|
|
static void
|
|
process_zlib_inflate(struct rte_comp_op *op, z_stream *strm)
|
|
{
|
|
int ret, flush;
|
|
struct rte_mbuf *mbuf_src = op->m_src;
|
|
struct rte_mbuf *mbuf_dst = op->m_dst;
|
|
|
|
if (unlikely(!strm)) {
|
|
op->status = RTE_COMP_OP_STATUS_INVALID_ARGS;
|
|
ZLIB_PMD_ERR("Invalid z_stream\n");
|
|
return;
|
|
}
|
|
strm->next_in = rte_pktmbuf_mtod_offset(mbuf_src, uint8_t *,
|
|
op->src.offset);
|
|
|
|
strm->avail_in = rte_pktmbuf_data_len(mbuf_src) - op->src.offset;
|
|
|
|
strm->next_out = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
|
|
op->dst.offset);
|
|
|
|
strm->avail_out = rte_pktmbuf_data_len(mbuf_dst) - op->dst.offset;
|
|
|
|
/** Ignoring flush value provided from application for decompression */
|
|
flush = Z_NO_FLUSH;
|
|
/* initialize status to SUCCESS */
|
|
op->status = RTE_COMP_OP_STATUS_SUCCESS;
|
|
|
|
do {
|
|
do {
|
|
ret = inflate(strm, flush);
|
|
|
|
switch (ret) {
|
|
/* Fall-through */
|
|
case Z_NEED_DICT:
|
|
ret = Z_DATA_ERROR;
|
|
/* Fall-through */
|
|
case Z_DATA_ERROR:
|
|
/* Fall-through */
|
|
case Z_MEM_ERROR:
|
|
/* Fall-through */
|
|
case Z_STREAM_ERROR:
|
|
op->status = RTE_COMP_OP_STATUS_ERROR;
|
|
/* Fall-through */
|
|
case Z_STREAM_END:
|
|
/* no further computation needed if
|
|
* Z_STREAM_END is encountered
|
|
*/
|
|
goto inf_end;
|
|
default:
|
|
/* success */
|
|
break;
|
|
|
|
}
|
|
/* Keep looping until input mbuf is consumed.
|
|
* Exit if destination mbuf gets exhausted.
|
|
*/
|
|
} while ((strm->avail_out == 0) &&
|
|
COMPUTE_BUF(mbuf_dst, strm->next_out, strm->avail_out));
|
|
|
|
if (!strm->avail_out) {
|
|
/* there is no more space for decompressed output */
|
|
op->status = RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED;
|
|
break;
|
|
}
|
|
/* Read next input buffer to be processed, exit if compressed
|
|
* blocks are fully read
|
|
*/
|
|
} while (COMPUTE_BUF(mbuf_src, strm->next_in, strm->avail_in));
|
|
|
|
inf_end:
|
|
/* Update op stats */
|
|
switch (op->status) {
|
|
case RTE_COMP_OP_STATUS_SUCCESS:
|
|
op->consumed += strm->total_in;
|
|
/* Fall-through */
|
|
case RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED:
|
|
op->produced += strm->total_out;
|
|
break;
|
|
default:
|
|
ZLIB_PMD_ERR("stats not produced for status:%d\n",
|
|
op->status);
|
|
}
|
|
|
|
inflateReset(strm);
|
|
}
|
|
|
|
/** Process comp operation for mbuf */
|
|
static inline int
|
|
process_zlib_op(struct zlib_qp *qp, struct rte_comp_op *op)
|
|
{
|
|
struct zlib_stream *stream;
|
|
struct zlib_priv_xform *private_xform;
|
|
|
|
if ((op->op_type == RTE_COMP_OP_STATEFUL) ||
|
|
(op->src.offset > rte_pktmbuf_data_len(op->m_src)) ||
|
|
(op->dst.offset > rte_pktmbuf_data_len(op->m_dst))) {
|
|
op->status = RTE_COMP_OP_STATUS_INVALID_ARGS;
|
|
ZLIB_PMD_ERR("Invalid source or destination buffers or "
|
|
"invalid Operation requested\n");
|
|
} else {
|
|
private_xform = (struct zlib_priv_xform *)op->private_xform;
|
|
stream = &private_xform->stream;
|
|
stream->comp(op, &stream->strm);
|
|
}
|
|
/* whatever is out of op, put it into completion queue with
|
|
* its status
|
|
*/
|
|
return rte_ring_enqueue(qp->processed_pkts, (void *)op);
|
|
}
|
|
|
|
/** Parse comp xform and set private xform/Stream parameters */
|
|
int
|
|
zlib_set_stream_parameters(const struct rte_comp_xform *xform,
|
|
struct zlib_stream *stream)
|
|
{
|
|
int strategy, level, wbits;
|
|
z_stream *strm = &stream->strm;
|
|
|
|
/* allocate deflate state */
|
|
strm->zalloc = Z_NULL;
|
|
strm->zfree = Z_NULL;
|
|
strm->opaque = Z_NULL;
|
|
|
|
switch (xform->type) {
|
|
case RTE_COMP_COMPRESS:
|
|
stream->comp = process_zlib_deflate;
|
|
stream->free = deflateEnd;
|
|
/** Compression window bits */
|
|
switch (xform->compress.algo) {
|
|
case RTE_COMP_ALGO_DEFLATE:
|
|
wbits = -(xform->compress.window_size);
|
|
break;
|
|
default:
|
|
ZLIB_PMD_ERR("Compression algorithm not supported\n");
|
|
return -1;
|
|
}
|
|
/** Compression Level */
|
|
switch (xform->compress.level) {
|
|
case RTE_COMP_LEVEL_PMD_DEFAULT:
|
|
level = Z_DEFAULT_COMPRESSION;
|
|
break;
|
|
case RTE_COMP_LEVEL_NONE:
|
|
level = Z_NO_COMPRESSION;
|
|
break;
|
|
case RTE_COMP_LEVEL_MIN:
|
|
level = Z_BEST_SPEED;
|
|
break;
|
|
case RTE_COMP_LEVEL_MAX:
|
|
level = Z_BEST_COMPRESSION;
|
|
break;
|
|
default:
|
|
level = xform->compress.level;
|
|
if (level < RTE_COMP_LEVEL_MIN ||
|
|
level > RTE_COMP_LEVEL_MAX) {
|
|
ZLIB_PMD_ERR("Compression level %d "
|
|
"not supported\n",
|
|
level);
|
|
return -1;
|
|
}
|
|
break;
|
|
}
|
|
/** Compression strategy */
|
|
switch (xform->compress.deflate.huffman) {
|
|
case RTE_COMP_HUFFMAN_DEFAULT:
|
|
strategy = Z_DEFAULT_STRATEGY;
|
|
break;
|
|
case RTE_COMP_HUFFMAN_FIXED:
|
|
strategy = Z_FIXED;
|
|
break;
|
|
case RTE_COMP_HUFFMAN_DYNAMIC:
|
|
strategy = Z_DEFAULT_STRATEGY;
|
|
break;
|
|
default:
|
|
ZLIB_PMD_ERR("Compression strategy not supported\n");
|
|
return -1;
|
|
}
|
|
if (deflateInit2(strm, level,
|
|
Z_DEFLATED, wbits,
|
|
DEF_MEM_LEVEL, strategy) != Z_OK) {
|
|
ZLIB_PMD_ERR("Deflate init failed\n");
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
case RTE_COMP_DECOMPRESS:
|
|
stream->comp = process_zlib_inflate;
|
|
stream->free = inflateEnd;
|
|
/** window bits */
|
|
switch (xform->decompress.algo) {
|
|
case RTE_COMP_ALGO_DEFLATE:
|
|
wbits = -(xform->decompress.window_size);
|
|
break;
|
|
default:
|
|
ZLIB_PMD_ERR("Compression algorithm not supported\n");
|
|
return -1;
|
|
}
|
|
|
|
if (inflateInit2(strm, wbits) != Z_OK) {
|
|
ZLIB_PMD_ERR("Inflate init failed\n");
|
|
return -1;
|
|
}
|
|
break;
|
|
default:
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static uint16_t
|
|
zlib_pmd_enqueue_burst(void *queue_pair,
|
|
struct rte_comp_op **ops, uint16_t nb_ops)
|
|
{
|
|
struct zlib_qp *qp = queue_pair;
|
|
int ret;
|
|
uint16_t i;
|
|
uint16_t enqd = 0;
|
|
for (i = 0; i < nb_ops; i++) {
|
|
ret = process_zlib_op(qp, ops[i]);
|
|
if (unlikely(ret < 0)) {
|
|
/* increment count if failed to push to completion
|
|
* queue
|
|
*/
|
|
qp->qp_stats.enqueue_err_count++;
|
|
} else {
|
|
qp->qp_stats.enqueued_count++;
|
|
enqd++;
|
|
}
|
|
}
|
|
return enqd;
|
|
}
|
|
|
|
static uint16_t
|
|
zlib_pmd_dequeue_burst(void *queue_pair,
|
|
struct rte_comp_op **ops, uint16_t nb_ops)
|
|
{
|
|
struct zlib_qp *qp = queue_pair;
|
|
|
|
unsigned int nb_dequeued = 0;
|
|
|
|
nb_dequeued = rte_ring_dequeue_burst(qp->processed_pkts,
|
|
(void **)ops, nb_ops, NULL);
|
|
qp->qp_stats.dequeued_count += nb_dequeued;
|
|
|
|
return nb_dequeued;
|
|
}
|
|
|
|
static int
|
|
zlib_create(const char *name,
|
|
struct rte_vdev_device *vdev,
|
|
struct rte_compressdev_pmd_init_params *init_params)
|
|
{
|
|
struct rte_compressdev *dev;
|
|
|
|
dev = rte_compressdev_pmd_create(name, &vdev->device,
|
|
sizeof(struct zlib_private), init_params);
|
|
if (dev == NULL) {
|
|
ZLIB_PMD_ERR("driver %s: create failed", init_params->name);
|
|
return -ENODEV;
|
|
}
|
|
|
|
dev->dev_ops = rte_zlib_pmd_ops;
|
|
|
|
/* register rx/tx burst functions for data path */
|
|
dev->dequeue_burst = zlib_pmd_dequeue_burst;
|
|
dev->enqueue_burst = zlib_pmd_enqueue_burst;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
zlib_probe(struct rte_vdev_device *vdev)
|
|
{
|
|
struct rte_compressdev_pmd_init_params init_params = {
|
|
"",
|
|
rte_socket_id()
|
|
};
|
|
const char *name;
|
|
const char *input_args;
|
|
int retval;
|
|
|
|
name = rte_vdev_device_name(vdev);
|
|
|
|
if (name == NULL)
|
|
return -EINVAL;
|
|
|
|
input_args = rte_vdev_device_args(vdev);
|
|
|
|
retval = rte_compressdev_pmd_parse_input_args(&init_params, input_args);
|
|
if (retval < 0) {
|
|
ZLIB_PMD_LOG(ERR,
|
|
"Failed to parse initialisation arguments[%s]\n",
|
|
input_args);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return zlib_create(name, vdev, &init_params);
|
|
}
|
|
|
|
static int
|
|
zlib_remove(struct rte_vdev_device *vdev)
|
|
{
|
|
struct rte_compressdev *compressdev;
|
|
const char *name;
|
|
|
|
name = rte_vdev_device_name(vdev);
|
|
if (name == NULL)
|
|
return -EINVAL;
|
|
|
|
compressdev = rte_compressdev_pmd_get_named_dev(name);
|
|
if (compressdev == NULL)
|
|
return -ENODEV;
|
|
|
|
return rte_compressdev_pmd_destroy(compressdev);
|
|
}
|
|
|
|
static struct rte_vdev_driver zlib_pmd_drv = {
|
|
.probe = zlib_probe,
|
|
.remove = zlib_remove
|
|
};
|
|
|
|
RTE_PMD_REGISTER_VDEV(COMPRESSDEV_NAME_ZLIB_PMD, zlib_pmd_drv);
|
|
RTE_LOG_REGISTER_DEFAULT(zlib_logtype_driver, INFO);
|