From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BF78AA0543 for ; Sat, 5 Nov 2022 18:13:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB12040151; Sat, 5 Nov 2022 18:13:53 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id F38DF400D5 for ; Sat, 5 Nov 2022 18:13:51 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id z14so10890307wrn.7 for ; Sat, 05 Nov 2022 10:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oi44JHsDuk/LKJD4k754JRG7c+xevwQ17+q56LiQDiA=; b=fpGNFO6wVOVNR2syHmYtBV1Ei8DgvqwZusJSlJKbkbdaXWV41KrK/oSPaSCLbx4/pW MuNlwMltvOCdYawtZ/PdzTFr9dyr8s0nMg6eWFuTBKET5k8Ntp7qw228LBmoYFkeRigu BSY3tjwzj+4sASs3I/IN+iX/GhfHj0FnZ6jQO2Qo49n52CeXIfC1G1QW9bXh5fd/YI8C Qx4lcA+HH5KhAKNQRhV//EyjbH1wlHjeOenZt2G6M3mfDKSHlMRqjWh2eWCxnRiTNbJo oB+N5C6Qlr+RvTvewnseEI1Teqy4UEswKzVX+9dTVNRtuJcu4Kn07Dkp88Ji8v59h8BA /YAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oi44JHsDuk/LKJD4k754JRG7c+xevwQ17+q56LiQDiA=; b=cbPzCHEdEjnyvtRJW+GUYffbRmwg4DdLsPaswlmHU3ts4X+Ar4+PEZiopXOGERiCF5 V7O0wMXoMzkobnCQmdDAXFqUnMGNJzquH0xNHO8i5exjYVatJi4Wsl7rEaL1yw2juvG0 cUUClDoSoEZJZZDs2PjFDzEot7Qn5dveaAbIvFjatgwXegFG8Dp6KsVNuUn/GT6da0rF zxZ+UdDvU/+IZl1ZZkGiqiRSiCGhb4qJJ+AoHlihPl90NuSYcceWmMsTlSuE2BZ9YZGR kaPDj5P9cv4KaIx0MVlOBZJzAJrUk81oOaH61sbTj9sfGpJWcRfKVbxlfvlEbQd1BFmd rg0w== X-Gm-Message-State: ACrzQf3kCJA62Lgz3QASfVpAIC0efUdVfhCX4b6E0img5KzHnOgDzco0 MOPJLP1FJ4U5scd+6sJd8XI= X-Google-Smtp-Source: AMsMyM5Sd48GoO0CIxSFJFYe3d/pdKkXySYcBzTYw3yteF0vchefqLrUUrtf395QEpPJ2dhU7/cnUg== X-Received: by 2002:adf:d1c9:0:b0:225:f98:d602 with SMTP id b9-20020adfd1c9000000b002250f98d602mr26582600wrd.419.1667668431738; Sat, 05 Nov 2022 10:13:51 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id p4-20020a05600c1d8400b003b497138093sm3005759wms.47.2022.11.05.10.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: add LDPC encoder padding function' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:36 +0000 Message-Id: <20221105171146.1520039-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a68bdd7eda31aee34ea52b45a94fd32d4699bdb9 Thanks. Luca Boccassi --- >From a68bdd7eda31aee34ea52b45a94fd32d4699bdb9 Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 20 Oct 2022 22:20:37 -0700 Subject: [PATCH] baseband/acc100: add LDPC encoder padding function [ upstream commit 6f3325bbfa556e8fe39df15f32424f40b2eb1d05 ] LDPC Encoder input may need to be padded to avoid small beat for ACC100. Padding 5GDL input buffer length (BLEN) to avoid case (BLEN % 64) <= 8. Adding protection for corner case to avoid for 5GDL occurrence of last beat within the ACC100 fabric with <= 8B which might trigger a fabric corner case hang issue. Fixes: 5ad5060f8f7 ("baseband/acc100: add LDPC processing functions") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index 5dca9e01d8..f9e45a61e7 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -1618,12 +1618,25 @@ acc100_dma_desc_te_fill(struct rte_bbdev_enc_op *op, return 0; } +/* May need to pad LDPC Encoder input to avoid small beat for ACC100. */ +static inline uint16_t +pad_le_in(uint16_t blen, struct acc100_queue *q __rte_unused) +{ + uint16_t last_beat; + + last_beat = blen % 64; + if ((last_beat > 0) && (last_beat <= 8)) + blen += 8; + + return blen; +} + static inline int acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op, struct acc100_dma_req_desc *desc, struct rte_mbuf **input, struct rte_mbuf *output, uint32_t *in_offset, uint32_t *out_offset, uint32_t *out_length, - uint32_t *mbuf_total_left, uint32_t *seg_total_left) + uint32_t *mbuf_total_left, uint32_t *seg_total_left, struct acc100_queue *q) { int next_triplet = 1; /* FCW already done */ uint16_t K, in_length_in_bits, in_length_in_bytes; @@ -1647,8 +1660,7 @@ acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op, } next_triplet = acc100_dma_fill_blk_type_in(desc, input, in_offset, - in_length_in_bytes, - seg_total_left, next_triplet); + pad_le_in(in_length_in_bytes, q), seg_total_left, next_triplet); if (unlikely(next_triplet < 0)) { rte_bbdev_log(ERR, "Mismatch between data to process and mbuf data length in bbdev_op: %p", @@ -2363,7 +2375,7 @@ enqueue_ldpc_enc_n_op_cb(struct acc100_queue *q, struct rte_bbdev_enc_op **ops, acc100_header_init(&desc->req); desc->req.numCBs = num; - in_length_in_bytes = ops[0]->ldpc_enc.input.data->data_len; + in_length_in_bytes = pad_le_in(ops[0]->ldpc_enc.input.data->data_len, q); out_length = (enc->cb_params.e + 7) >> 3; desc->req.m2dlen = 1 + num; desc->req.d2mlen = num; @@ -2432,7 +2444,7 @@ enqueue_ldpc_enc_one_op_cb(struct acc100_queue *q, struct rte_bbdev_enc_op *op, ret = acc100_dma_desc_le_fill(op, &desc->req, &input, output, &in_offset, &out_offset, &out_length, &mbuf_total_left, - &seg_total_left); + &seg_total_left, q); if (unlikely(ret < 0)) return ret; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:11.953066330 +0000 +++ 0037-baseband-acc100-add-LDPC-encoder-padding-function.patch 2022-11-05 17:11:08.798945303 +0000 @@ -1 +1 @@ -From 6f3325bbfa556e8fe39df15f32424f40b2eb1d05 Mon Sep 17 00:00:00 2001 +From a68bdd7eda31aee34ea52b45a94fd32d4699bdb9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6f3325bbfa556e8fe39df15f32424f40b2eb1d05 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - drivers/baseband/acc/rte_acc100_pmd.c | 28 ++++++++++++++++++++------- - 1 file changed, 21 insertions(+), 7 deletions(-) + drivers/baseband/acc100/rte_acc100_pmd.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) @@ -21,22 +22,6 @@ -diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c -index 7500ef6eb5..577c107e9a 100644 ---- a/drivers/baseband/acc/rte_acc100_pmd.c -+++ b/drivers/baseband/acc/rte_acc100_pmd.c -@@ -1017,14 +1017,13 @@ acc100_fcw_td_fill(const struct rte_bbdev_dec_op *op, struct acc_fcw_td *fcw) - RTE_BBDEV_TURBO_HALF_ITERATION_EVEN); - } - --#ifdef RTE_LIBRTE_BBDEV_DEBUG -- - static inline bool - is_acc100(struct acc_queue *q) - { - return (q->d->device_variant == ACC100_VARIANT); - } - -+#ifdef RTE_LIBRTE_BBDEV_DEBUG - static inline bool - validate_op_required(struct acc_queue *q) - { -@@ -1355,12 +1354,28 @@ acc100_dma_fill_blk_type_in(struct acc_dma_req_desc *desc, - return next_triplet; +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index 5dca9e01d8..f9e45a61e7 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -1618,12 +1618,25 @@ acc100_dma_desc_te_fill(struct rte_bbdev_enc_op *op, + return 0; @@ -47 +32 @@ -+pad_le_in(uint16_t blen, struct acc_queue *q) ++pad_le_in(uint16_t blen, struct acc100_queue *q __rte_unused) @@ -51,3 +35,0 @@ -+ if (!is_acc100(q)) -+ return blen; -+ @@ -63 +45 @@ - struct acc_dma_req_desc *desc, struct rte_mbuf **input, + struct acc100_dma_req_desc *desc, struct rte_mbuf **input, @@ -67 +49 @@ -+ uint32_t *mbuf_total_left, uint32_t *seg_total_left, struct acc_queue *q) ++ uint32_t *mbuf_total_left, uint32_t *seg_total_left, struct acc100_queue *q) @@ -71 +53 @@ -@@ -1384,8 +1399,7 @@ acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op, +@@ -1647,8 +1660,7 @@ acc100_dma_desc_le_fill(struct rte_bbdev_enc_op *op, @@ -81,2 +63,2 @@ -@@ -2035,7 +2049,7 @@ enqueue_ldpc_enc_n_op_cb(struct acc_queue *q, struct rte_bbdev_enc_op **ops, - acc_header_init(&desc->req); +@@ -2363,7 +2375,7 @@ enqueue_ldpc_enc_n_op_cb(struct acc100_queue *q, struct rte_bbdev_enc_op **ops, + acc100_header_init(&desc->req); @@ -90 +72 @@ -@@ -2102,7 +2116,7 @@ enqueue_ldpc_enc_one_op_cb(struct acc_queue *q, struct rte_bbdev_enc_op *op, +@@ -2432,7 +2444,7 @@ enqueue_ldpc_enc_one_op_cb(struct acc100_queue *q, struct rte_bbdev_enc_op *op,