[v2,08/37] baseband/acc100: add scatter-gather support
Checks
Commit Message
Add flag to support scatter-gather for the mbuf
Signed-off-by: Hernan Vargas <hernan.vargas@intel.com>
---
drivers/baseband/acc100/rte_acc100_pmd.c | 45 ++++++++++++++++--------
1 file changed, 31 insertions(+), 14 deletions(-)
Comments
On 8/20/22 04:31, Hernan Vargas wrote:
> Add flag to support scatter-gather for the mbuf
>
> Signed-off-by: Hernan Vargas <hernan.vargas@intel.com>
> ---
> drivers/baseband/acc100/rte_acc100_pmd.c | 45 ++++++++++++++++--------
> 1 file changed, 31 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c
> index 4849d822d1..a7e0df96e8 100644
> --- a/drivers/baseband/acc100/rte_acc100_pmd.c
> +++ b/drivers/baseband/acc100/rte_acc100_pmd.c
> @@ -1585,6 +1585,8 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
> * Store information about device capabilities
> * @param next_triplet
> * Index for ACC100 DMA Descriptor triplet
> + * @param scattergather
> + * Flag to support scatter-gather for the mbuf
> *
> * @return
> * Returns index of next triplet on success, other value if lengths of
> @@ -1594,12 +1596,17 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
> static inline int
> acc100_dma_fill_blk_type_in(struct acc100_dma_req_desc *desc,
> struct rte_mbuf **input, uint32_t *offset, uint32_t cb_len,
> - uint32_t *seg_total_left, int next_triplet)
> + uint32_t *seg_total_left, int next_triplet,
> + bool scattergather)
> {
> uint32_t part_len;
> struct rte_mbuf *m = *input;
>
> - part_len = (*seg_total_left < cb_len) ? *seg_total_left : cb_len;
> + if (scattergather)
> + part_len = (*seg_total_left < cb_len) ?
> + *seg_total_left : cb_len;
> + else
> + part_len = cb_len;
> cb_len -= part_len;
> *seg_total_left -= part_len;
>
> @@ -1735,7 +1742,9 @@ acc100_dma_desc_te_fill(struct rte_bbdev_enc_op *op,
> }
>
> next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset,
> - length, seg_total_left, next_triplet);
> + length, seg_total_left, next_triplet,
> + check_bit(op->turbo_enc.op_flags,
> + RTE_BBDEV_TURBO_ENC_SCATTER_GATHER));
> if (unlikely(next_triplet < 0)) {
> rte_bbdev_log(ERR,
> "Mismatch between data to process and mbuf data length in bbdev_op: %p",
> @@ -1812,7 +1821,7 @@ acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op,
> }
>
> next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset,
> - pad_le_in(in_length_in_bytes, q), seg_total_left, next_triplet);
> + pad_le_in(in_length_in_bytes, q), seg_total_left, next_triplet, false);
> if (unlikely(next_triplet < 0)) {
> rte_bbdev_log(ERR,
> "Mismatch between data to process and mbuf data length in bbdev_op: %p",
> @@ -1900,7 +1909,9 @@ acc100_dma_desc_td_fill(struct rte_bbdev_dec_op *op,
> }
>
> next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset, kw,
> - seg_total_left, next_triplet);
> + seg_total_left, next_triplet,
> + check_bit(op->turbo_dec.op_flags,
> + RTE_BBDEV_TURBO_DEC_SCATTER_GATHER));
> if (unlikely(next_triplet < 0)) {
> rte_bbdev_log(ERR,
> "Mismatch between data to process and mbuf data length in bbdev_op: %p",
> @@ -2002,7 +2013,9 @@ acc100_dma_desc_ld_fill(struct rte_bbdev_dec_op *op,
>
> next_triplet = acc100_dma_fill_blk_type_in(desc, input,
> in_offset, input_length,
> - seg_total_left, next_triplet);
> + seg_total_left, next_triplet,
> + check_bit(op->ldpc_dec.op_flags,
> + RTE_BBDEV_LDPC_DEC_SCATTER_GATHER));
>
> if (unlikely(next_triplet < 0)) {
> rte_bbdev_log(ERR,
> @@ -3142,8 +3155,9 @@ enqueue_ldpc_dec_one_op_cb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
> fcw = &desc->req.fcw_ld;
> q->d->fcw_ld_fill(op, fcw, harq_layout);
>
> - /* Special handling when overusing mbuf */
> - if (fcw->rm_e < ACC100_MAX_E_MBUF)
> + /* Special handling when using mbuf or not */
> + if (check_bit(op->ldpc_dec.op_flags,
> + RTE_BBDEV_LDPC_DEC_SCATTER_GATHER))
> seg_total_left = rte_pktmbuf_data_len(input)
> - in_offset;
> else
> @@ -3219,9 +3233,12 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
> r = op->ldpc_dec.tb_params.r;
>
> while (mbuf_total_left > 0 && r < c) {
> -
> - seg_total_left = rte_pktmbuf_data_len(input) - in_offset;
> -
> + if (check_bit(op->ldpc_dec.op_flags,
> + RTE_BBDEV_LDPC_DEC_SCATTER_GATHER))
> + seg_total_left = rte_pktmbuf_data_len(input)
> + - in_offset;
> + else
> + seg_total_left = op->ldpc_dec.input.length;
> /* Set up DMA descriptor */
> desc = q->ring_addr + ((q->sw_ring_head + total_enqueued_cbs)
> & q->sw_ring_wrap_mask);
> @@ -3246,8 +3263,9 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
> sizeof(desc->req.fcw_td) - 8);
> rte_memdump(stderr, "Req Desc.", desc, sizeof(*desc));
> #endif
> -
> - if (seg_total_left == 0) {
> + if (check_bit(op->ldpc_dec.op_flags,
> + RTE_BBDEV_LDPC_DEC_SCATTER_GATHER)
> + && (seg_total_left == 0)) {
> /* Go to the next mbuf */
> input = input->next;
> in_offset = 0;
> @@ -3258,7 +3276,6 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
> current_enqueued_cbs++;
> r++;
> }
> -
Keep this new line.
> #ifdef RTE_LIBRTE_BBDEV_DEBUG
> if (check_mbuf_total_left(mbuf_total_left) != 0)
> return -EINVAL;
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
@@ -1585,6 +1585,8 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
* Store information about device capabilities
* @param next_triplet
* Index for ACC100 DMA Descriptor triplet
+ * @param scattergather
+ * Flag to support scatter-gather for the mbuf
*
* @return
* Returns index of next triplet on success, other value if lengths of
@@ -1594,12 +1596,17 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
static inline int
acc100_dma_fill_blk_type_in(struct acc100_dma_req_desc *desc,
struct rte_mbuf **input, uint32_t *offset, uint32_t cb_len,
- uint32_t *seg_total_left, int next_triplet)
+ uint32_t *seg_total_left, int next_triplet,
+ bool scattergather)
{
uint32_t part_len;
struct rte_mbuf *m = *input;
- part_len = (*seg_total_left < cb_len) ? *seg_total_left : cb_len;
+ if (scattergather)
+ part_len = (*seg_total_left < cb_len) ?
+ *seg_total_left : cb_len;
+ else
+ part_len = cb_len;
cb_len -= part_len;
*seg_total_left -= part_len;
@@ -1735,7 +1742,9 @@ acc100_dma_desc_te_fill(struct rte_bbdev_enc_op *op,
}
next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset,
- length, seg_total_left, next_triplet);
+ length, seg_total_left, next_triplet,
+ check_bit(op->turbo_enc.op_flags,
+ RTE_BBDEV_TURBO_ENC_SCATTER_GATHER));
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
"Mismatch between data to process and mbuf data length in bbdev_op: %p",
@@ -1812,7 +1821,7 @@ acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op,
}
next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset,
- pad_le_in(in_length_in_bytes, q), seg_total_left, next_triplet);
+ pad_le_in(in_length_in_bytes, q), seg_total_left, next_triplet, false);
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
"Mismatch between data to process and mbuf data length in bbdev_op: %p",
@@ -1900,7 +1909,9 @@ acc100_dma_desc_td_fill(struct rte_bbdev_dec_op *op,
}
next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset, kw,
- seg_total_left, next_triplet);
+ seg_total_left, next_triplet,
+ check_bit(op->turbo_dec.op_flags,
+ RTE_BBDEV_TURBO_DEC_SCATTER_GATHER));
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
"Mismatch between data to process and mbuf data length in bbdev_op: %p",
@@ -2002,7 +2013,9 @@ acc100_dma_desc_ld_fill(struct rte_bbdev_dec_op *op,
next_triplet = acc100_dma_fill_blk_type_in(desc, input,
in_offset, input_length,
- seg_total_left, next_triplet);
+ seg_total_left, next_triplet,
+ check_bit(op->ldpc_dec.op_flags,
+ RTE_BBDEV_LDPC_DEC_SCATTER_GATHER));
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
@@ -3142,8 +3155,9 @@ enqueue_ldpc_dec_one_op_cb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
fcw = &desc->req.fcw_ld;
q->d->fcw_ld_fill(op, fcw, harq_layout);
- /* Special handling when overusing mbuf */
- if (fcw->rm_e < ACC100_MAX_E_MBUF)
+ /* Special handling when using mbuf or not */
+ if (check_bit(op->ldpc_dec.op_flags,
+ RTE_BBDEV_LDPC_DEC_SCATTER_GATHER))
seg_total_left = rte_pktmbuf_data_len(input)
- in_offset;
else
@@ -3219,9 +3233,12 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
r = op->ldpc_dec.tb_params.r;
while (mbuf_total_left > 0 && r < c) {
-
- seg_total_left = rte_pktmbuf_data_len(input) - in_offset;
-
+ if (check_bit(op->ldpc_dec.op_flags,
+ RTE_BBDEV_LDPC_DEC_SCATTER_GATHER))
+ seg_total_left = rte_pktmbuf_data_len(input)
+ - in_offset;
+ else
+ seg_total_left = op->ldpc_dec.input.length;
/* Set up DMA descriptor */
desc = q->ring_addr + ((q->sw_ring_head + total_enqueued_cbs)
& q->sw_ring_wrap_mask);
@@ -3246,8 +3263,9 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
sizeof(desc->req.fcw_td) - 8);
rte_memdump(stderr, "Req Desc.", desc, sizeof(*desc));
#endif
-
- if (seg_total_left == 0) {
+ if (check_bit(op->ldpc_dec.op_flags,
+ RTE_BBDEV_LDPC_DEC_SCATTER_GATHER)
+ && (seg_total_left == 0)) {
/* Go to the next mbuf */
input = input->next;
in_offset = 0;
@@ -3258,7 +3276,6 @@ enqueue_ldpc_dec_one_op_tb(struct acc100_queue *q, struct rte_bbdev_dec_op *op,
current_enqueued_cbs++;
r++;
}
-
#ifdef RTE_LIBRTE_BBDEV_DEBUG
if (check_mbuf_total_left(mbuf_total_left) != 0)
return -EINVAL;