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 658E4A00C2; Fri, 14 Oct 2022 11:56:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3623742D22; Fri, 14 Oct 2022 11:56:14 +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 ECA9842CF8 for ; Fri, 14 Oct 2022 11:56:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665741371; 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=RdvM/Fq/rlm0lhQnKr5snQDJE0vyQiV7luNOorCa9AY=; b=bDVnAJ78xhwqPQr0UkGp48xQ508KDYhdfDhTi4ScsOEEetqJEvVf04UCG1LxJNuoswC52D LLPfrlE7p6j9ebLt7r8nT3Yv9eF7ZM2gAfuAgWUBhv1Ev2hkJXWlRi5HJVbWiphARQLh+m eoR2LQoRRZrtUfBjjhtle2nme3w7/Co= 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-223-jKjaROcQM4qLiM4khPctkQ-1; Fri, 14 Oct 2022 05:56:01 -0400 X-MC-Unique: jKjaROcQM4qLiM4khPctkQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8C2F280280D; Fri, 14 Oct 2022 09:56:00 +0000 (UTC) Received: from [10.39.208.28] (unknown [10.39.208.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 395822141DE3; Fri, 14 Oct 2022 09:55:58 +0000 (UTC) Message-ID: Date: Fri, 14 Oct 2022 11:55:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 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-9-hernan.vargas@intel.com> From: Maxime Coquelin Subject: Re: [PATCH v3 08/30] baseband/acc100: allocate ring/queue mem when NULL In-Reply-To: <20221012025346.204394-9-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: > Allocate info ring, tail pointers and HARQ layout memory for a device > only if it hasn't already been allocated. > > Fixes: 06531464151 ("baseband/acc100: support interrupt") > Cc: stable@dpdk.org > > Signed-off-by: Hernan Vargas > --- > drivers/baseband/acc/rte_acc100_pmd.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c > index c1446b3721..c0184b8174 100644 > --- a/drivers/baseband/acc/rte_acc100_pmd.c > +++ b/drivers/baseband/acc/rte_acc100_pmd.c > @@ -406,7 +406,8 @@ allocate_info_ring(struct rte_bbdev *dev) > else > reg_addr = &vf_reg_addr; > /* Allocate InfoRing */ > - d->info_ring = rte_zmalloc_socket("Info Ring", > + if (d->info_ring == NULL) Isn't there a check already in the function entry that returns early if already allocated? > + d->info_ring = rte_zmalloc_socket("Info Ring", > ACC_INFO_RING_NUM_ENTRIES * > sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, > dev->data->socket_id); > @@ -498,7 +499,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) > acc_reg_write(d, reg_addr->ring_size, value); > > /* Configure tail pointer for use when SDONE enabled */ > - d->tail_ptrs = rte_zmalloc_socket( > + if (d->tail_ptrs == NULL) > + d->tail_ptrs = rte_zmalloc_socket( > dev->device->driver->name, > ACC100_NUM_QGRPS * ACC100_NUM_AQS * sizeof(uint32_t), > RTE_CACHE_LINE_SIZE, socket_id); In case of tail_ptrs, sw_rings is freed, but not set to NULL. At the function entry, we check sw_rings is non-NULL before proceeding to allocation. It would be better to have a proper error path using gotos. > @@ -530,7 +532,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) > /* Continue */ > } > > - d->harq_layout = rte_zmalloc_socket("HARQ Layout", > + if (d->harq_layout == NULL) > + d->harq_layout = rte_zmalloc_socket("HARQ Layout", > ACC_HARQ_LAYOUT * sizeof(*d->harq_layout), > RTE_CACHE_LINE_SIZE, dev->data->socket_id); > if (d->harq_layout == NULL) { Same comment here.