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 B2E46A00C2; Fri, 14 Oct 2022 11:25:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 296D042D0A; Fri, 14 Oct 2022 11:25:16 +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 90A9E410F2 for ; Fri, 14 Oct 2022 11:25:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665739514; 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=tE6mY4JuL6YVYSdsPswTTLRMkzB93oRjsog1ESA2xDg=; b=dnSgWSjaDQnzkFEkAFr344bXT8tIApbatirKMZrIrfPuZ27g7dM01sM6iAL/G1bOnRLF1h WUKHT2wXcmtzEos5cyk5t9LDJPRBZWmkWIX6UNxbuPPa0t6cUR+QYVQTPaPu0qoGSTprRc bMlVR7lFumAbdtsXE14HTRMHmefrsSQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-671-SZM-AoloN_yfKdu7yUcQGA-1; Fri, 14 Oct 2022 05:25:09 -0400 X-MC-Unique: SZM-AoloN_yfKdu7yUcQGA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DDE3A185A794; Fri, 14 Oct 2022 09:25:08 +0000 (UTC) Received: from [10.39.208.28] (unknown [10.39.208.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F8F3440F1; Fri, 14 Oct 2022 09:25:07 +0000 (UTC) Message-ID: Date: Fri, 14 Oct 2022 11:25:06 +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 02/30] baseband/acc100: add function to check AQ availability 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-3-hernan.vargas@intel.com> From: Maxime Coquelin In-Reply-To: <20221012025346.204394-3-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: > It is possible for some corner case to run more batch enqueue than > supported. A protection is required to avoid that corner case. > Enhance all ACC100 enqueue operations with check to see if there is room > in the atomic queue for enqueueing batches into the queue manager > Check room in AQ for the enqueues batches into Qmgr > > Fixes: 5ad5060f8f7 ("baseband/acc100: add LDPC processing functions") > Cc: stable@dpdk.org > > Signed-off-by: Hernan Vargas > --- > drivers/baseband/acc/rte_acc100_pmd.c | 30 ++++++++++++++++++++------- > 1 file changed, 22 insertions(+), 8 deletions(-) > > diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c > index 733766ad3e..b436bd9078 100644 > --- a/drivers/baseband/acc/rte_acc100_pmd.c > +++ b/drivers/baseband/acc/rte_acc100_pmd.c > @@ -2995,12 +2995,27 @@ acc100_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data, > return i; > } > > +/* Check room in AQ for the enqueues batches into Qmgr */ > +static int32_t > +acc100_aq_avail(struct rte_bbdev_queue_data *q_data, uint16_t num_ops) > +{ > + struct acc_queue *q = q_data->queue_private; > + int32_t aq_avail = q->aq_depth - > + ((q->aq_enqueued - q->aq_dequeued + ACC_MAX_QUEUE_DEPTH) > + % ACC_MAX_QUEUE_DEPTH) - (num_ops >> 7); > + if (aq_avail <= 0) Maybe use unlikely() here. > + acc_enqueue_queue_full(q_data); > + > + return aq_avail; > +} > + > /* Enqueue encode operations for ACC100 device. */ > static uint16_t > acc100_enqueue_enc(struct rte_bbdev_queue_data *q_data, > struct rte_bbdev_enc_op **ops, uint16_t num) > { > - if (unlikely(num == 0)) > + int32_t aq_avail = acc100_aq_avail(q_data, num); Please insert new line for readability. > + if (unlikely((aq_avail <= 0) || (num == 0))) > return 0; Ditto > if (ops[0]->turbo_enc.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) > return acc100_enqueue_enc_tb(q_data, ops, num); > @@ -3013,7 +3028,8 @@ static uint16_t > acc100_enqueue_ldpc_enc(struct rte_bbdev_queue_data *q_data, > struct rte_bbdev_enc_op **ops, uint16_t num) > { > - if (unlikely(num == 0)) > + int32_t aq_avail = acc100_aq_avail(q_data, num); New line. > + if (unlikely((aq_avail <= 0) || (num == 0))) > return 0; > if (ops[0]->ldpc_enc.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) > return acc100_enqueue_enc_tb(q_data, ops, num); > @@ -3183,7 +3199,8 @@ static uint16_t > acc100_enqueue_dec(struct rte_bbdev_queue_data *q_data, > struct rte_bbdev_dec_op **ops, uint16_t num) > { > - if (unlikely(num == 0)) > + int32_t aq_avail = acc100_aq_avail(q_data, num); New line. > + if (unlikely((aq_avail <= 0) || (num == 0))) > return 0; New line. > if (ops[0]->turbo_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) > return acc100_enqueue_dec_tb(q_data, ops, num); > @@ -3196,11 +3213,8 @@ static uint16_t > acc100_enqueue_ldpc_dec(struct rte_bbdev_queue_data *q_data, > struct rte_bbdev_dec_op **ops, uint16_t num) > { > - struct acc_queue *q = q_data->queue_private; > - int32_t aq_avail = q->aq_depth + > - (q->aq_dequeued - q->aq_enqueued) / 128; > - > - if (unlikely((aq_avail == 0) || (num == 0))) > + int32_t aq_avail = acc100_aq_avail(q_data, num); New line. > + if (unlikely((aq_avail <= 0) || (num == 0))) > return 0; > > if (ops[0]->ldpc_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK)