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 DDFFBA0542 for ; Fri, 11 Nov 2022 11:35:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D99A342D0E; Fri, 11 Nov 2022 11:35:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 04B394014F for ; Fri, 11 Nov 2022 11:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qzwYgDGbGIuciTAfNtppBRPfAbX9/oR+vO2XE8HErjo=; b=NyXVcoo0lPAMfUseM+ya84+ohOdr2Sp9VUyF4bCGIuEYVzjBhPYTJwWe0M7F9CB4KzsIdY k6uc8FLR9XpHpvII9eFNqD57nnO2l6HvcO5GihXmq53lLwkyJ8gkbOJPUJMxY+kz8MgiPD mDxwn7x9ZCmQlBfRXucAZqGo8jTHo7c= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-0nx8JnzAPGq6C18_MbMx6w-1; Fri, 11 Nov 2022 05:35:02 -0500 X-MC-Unique: 0nx8JnzAPGq6C18_MbMx6w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97EA43850E8A; Fri, 11 Nov 2022 10:35:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id A89A82022C2B; Fri, 11 Nov 2022 10:35:01 +0000 (UTC) From: Kevin Traynor To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: add null checks' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:29 +0000 Message-Id: <20221111103337.307408-39-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/14/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/4fb74afa15049708536aa5fdaa86999739136dfd Thanks. Kevin --- >From 4fb74afa15049708536aa5fdaa86999739136dfd Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 20 Oct 2022 22:20:39 -0700 Subject: [PATCH] baseband/acc100: add null checks [ upstream commit 4a2f231ee139717f61d36a3df8aaab74644ca2b5 ] Add unlikely checks for NULL operation values. Fixes: f404dfe35cc ("baseband/acc100: support 4G processing") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index 82d23af1a1..9eb7641f70 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -2503,4 +2503,8 @@ enqueue_enc_one_op_tb(struct acc100_queue *q, struct rte_bbdev_enc_op *op, while (mbuf_total_left > 0 && r < c) { + if (unlikely(input == NULL)) { + rte_bbdev_log(ERR, "Not enough input segment"); + return -EINVAL; + } seg_total_left = rte_pktmbuf_data_len(input) - in_offset; /* Set up DMA descriptor */ @@ -3534,4 +3538,6 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, enqueued_cbs += ret; } + if (unlikely(enqueued_cbs == 0)) + return 0; /* Nothing to enqueue */ acc100_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); @@ -4076,4 +4082,6 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data, op = (q->ring_addr + ((q->sw_ring_tail + dequeued_cbs) & q->sw_ring_wrap_mask))->req.op_addr; + if (unlikely(op == NULL)) + break; if (op->turbo_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) ret = dequeue_dec_one_op_tb(q, &ops[i], dequeued_cbs, @@ -4121,4 +4129,6 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, op = (q->ring_addr + ((q->sw_ring_tail + dequeued_cbs) & q->sw_ring_wrap_mask))->req.op_addr; + if (unlikely(op == NULL)) + break; if (op->ldpc_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) ret = dequeue_dec_one_op_tb(q, &ops[i], dequeued_cbs, -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.992553176 +0000 +++ 0039-baseband-acc100-add-null-checks.patch 2022-11-11 10:32:17.113300926 +0000 @@ -1 +1 @@ -From 4a2f231ee139717f61d36a3df8aaab74644ca2b5 Mon Sep 17 00:00:00 2001 +From 4fb74afa15049708536aa5fdaa86999739136dfd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a2f231ee139717f61d36a3df8aaab74644ca2b5 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - drivers/baseband/acc/rte_acc100_pmd.c | 10 ++++++++++ + drivers/baseband/acc100/rte_acc100_pmd.c | 10 ++++++++++ @@ -17,5 +18,5 @@ -diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c -index eba70654e8..e8ec70d954 100644 ---- a/drivers/baseband/acc/rte_acc100_pmd.c -+++ b/drivers/baseband/acc/rte_acc100_pmd.c -@@ -2181,4 +2181,8 @@ enqueue_enc_one_op_tb(struct acc_queue *q, struct rte_bbdev_enc_op *op, +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index 82d23af1a1..9eb7641f70 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -2503,4 +2503,8 @@ enqueue_enc_one_op_tb(struct acc100_queue *q, struct rte_bbdev_enc_op *op, @@ -30 +31 @@ -@@ -3098,4 +3102,6 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, +@@ -3534,4 +3538,6 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, @@ -36,4 +37,4 @@ - acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); -@@ -3626,4 +3632,6 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data, - for (i = 0; i < dequeue_num; ++i) { - op = acc_op_tail(q, dequeued_cbs); + acc100_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); +@@ -4076,4 +4082,6 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data, + op = (q->ring_addr + ((q->sw_ring_tail + dequeued_cbs) + & q->sw_ring_wrap_mask))->req.op_addr; @@ -44 +45 @@ -@@ -3671,4 +3679,6 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, +@@ -4121,4 +4129,6 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data,