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 14EC1A00C2; Fri, 14 Oct 2022 11:39:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE621410F2; Fri, 14 Oct 2022 11:39:35 +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 7B744410F1 for ; Fri, 14 Oct 2022 11:39:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665740374; 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=dpCpcGTHCxPf8yN3u+z5icaZNnt3RvdL+j8F5Fmbeno=; b=cOLm8LdAmFQl4JU+fpuS4U2eJdGXY4UB6PuoKJTOdEHYe5dbRbfW164sK0Xi3C3xnlg6Gu MuqFGGS1we38MLCb1t5d+M5sEST3AEvr8SxW/DCWrLhDIvj4oQWaVMKfdKINNEqWrwfZNf HWE7AqOBYO4BlJKtIwUiHUCJqji0gnE= 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-623-Um7KImHcNiO1piWMFpmQsQ-1; Fri, 14 Oct 2022 05:39:31 -0400 X-MC-Unique: Um7KImHcNiO1piWMFpmQsQ-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 87F5F381494D; Fri, 14 Oct 2022 09:39:30 +0000 (UTC) Received: from [10.39.208.28] (unknown [10.39.208.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 316DA200C0DF; Fri, 14 Oct 2022 09:39:28 +0000 (UTC) Message-ID: <32cfb672-a5cd-fdc8-a3a8-73fc4daad1c0@redhat.com> Date: Fri, 14 Oct 2022 11:39:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH v3 06/30] 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, stable@dpdk.org References: <20221012025346.204394-1-hernan.vargas@intel.com> <20221012025346.204394-7-hernan.vargas@intel.com> From: Maxime Coquelin In-Reply-To: <20221012025346.204394-7-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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 10/12/22 04:53, Hernan Vargas wrote: > Add unlikely checks for NULL operation values. > > Fixes: f404dfe35cc ("baseband/acc100: support 4G processing") > Cc: stable@dpdk.org > > Signed-off-by: Hernan Vargas > > Reviewed-by: Maxime Coquelin > --- > drivers/baseband/acc/rte_acc100_pmd.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c > index 3a008a3b88..5e8ed78559 100644 > --- a/drivers/baseband/acc/rte_acc100_pmd.c > +++ b/drivers/baseband/acc/rte_acc100_pmd.c > @@ -2184,6 +2184,10 @@ enqueue_enc_one_op_tb(struct acc_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)) { This should be a NULL check, as input is a mbuf pointer. > + 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) > @@ -3128,6 +3132,8 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, > break; > enqueued_cbs += ret; > } > + if (unlikely(enqueued_cbs == 0)) > + return 0; /* Nothing to enqueue */ > > acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); > > @@ -3669,6 +3675,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); > @@ -3714,6 +3722,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);