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 9A396A00C5; Thu, 15 Sep 2022 12:03:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D4BD4021D; Thu, 15 Sep 2022 12:03:05 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2406B40156 for ; Thu, 15 Sep 2022 12:03:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663236183; 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=lt1UOocA/EkT10K9yXV3Rj5WuIvmbl91XDcwcbYzzPI=; b=WUSaqMkJvn+mDNBGdv3/XTQH0OxNqLhXShFT4E2wqQR6cHPxhU3McrdYAixj2APpcJFURF z+T3kqqekfgUyUTXz6iu7tK14MVZ22qhKFuyCkA+dwt7pcmeREOyEaP0fNT78XuuExqU7+ pIcXf830CQa7HkSYnONExc75GJ0V3p4= 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-517-3DhcirbhMmmWtJToR5x47A-1; Thu, 15 Sep 2022 06:02:59 -0400 X-MC-Unique: 3DhcirbhMmmWtJToR5x47A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF0821C14B7C; Thu, 15 Sep 2022 10:02:58 +0000 (UTC) Received: from [10.39.208.12] (unknown [10.39.208.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 907BA140EBF4; Thu, 15 Sep 2022 10:02:57 +0000 (UTC) Message-ID: Date: Thu, 15 Sep 2022 12:02:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v2 21/37] baseband/acc100: check for unlikely operation vals To: Hernan Vargas , dev@dpdk.org, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com References: <20220820023157.189047-1-hernan.vargas@intel.com> <20220820023157.189047-22-hernan.vargas@intel.com> From: Maxime Coquelin In-Reply-To: <20220820023157.189047-22-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On 8/20/22 04:31, Hernan Vargas wrote: > Add unlikely checks for NULL operation values. Same as for patch 20, this is a fix. > Signed-off-by: Hernan Vargas > --- > 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 70a29f92a1..ea850e2d7f 100644 > --- a/drivers/baseband/acc100/rte_acc100_pmd.c > +++ b/drivers/baseband/acc100/rte_acc100_pmd.c > @@ -3148,6 +3148,10 @@ enqueue_enc_one_op_tb(struct acc100_queue *q, struct rte_bbdev_enc_op *op, > r = op->turbo_enc.tb_params.r; > > while (mbuf_total_left > 0 && r < c) { > + if (unlikely(input == 0)) { > + rte_bbdev_log(ERR, "Not enough input segment"); > + return -EINVAL; > + } > seg_total_left = rte_pktmbuf_data_len(input) - in_offset; > /* Set up DMA descriptor */ > desc = q->ring_addr + ((q->sw_ring_head + total_enqueued_cbs) > @@ -4491,6 +4495,8 @@ 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); > > @@ -5051,6 +5057,8 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data, > for (i = 0; i < dequeue_num; ++i) { > 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, > &aq_dequeued); > @@ -5096,6 +5104,8 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, > for (i = 0; i < dequeue_num; ++i) { > 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, > &aq_dequeued); With commit message ammended: Reviewed-by: Maxime Coquelin Thanks, Maxime