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 98932A0524; Fri, 7 May 2021 18:47:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E02A4013F; Fri, 7 May 2021 18:47:18 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 148DE40040 for ; Fri, 7 May 2021 18:47:15 +0200 (CEST) IronPort-SDR: wFM7+qQimH3IWHLW6xR2q3A47kNklkgDo9ZOd5B6CSbK7snzXVAXsNEavSVoLh/cZN+6QiZ6Pc TnaZzcQHvJNA== X-IronPort-AV: E=McAfee;i="6200,9189,9977"; a="284224282" X-IronPort-AV: E=Sophos;i="5.82,281,1613462400"; d="scan'208";a="284224282" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2021 09:47:14 -0700 IronPort-SDR: 8JIRkzTmnVTpDCaVgfDSsHrRXf5iwJStKnM9FaNYtCGFwRc0jhlZ1syYBOFofBdEhG4QuR2gnG xHADhNnk9rPA== X-IronPort-AV: E=Sophos;i="5.82,281,1613462400"; d="scan'208";a="431442454" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.210.230]) ([10.213.210.230]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2021 09:47:12 -0700 To: Michal Krawczyk , dev@dpdk.org Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com, upstream@semihalf.com References: <20210505073348.6394-1-mk@semihalf.com> <20210506142526.28245-1-mk@semihalf.com> <20210506142526.28245-7-mk@semihalf.com> From: Ferruh Yigit X-User: ferruhy Message-ID: <6fb65511-fca0-bf2d-98eb-9daddeb669de@intel.com> Date: Fri, 7 May 2021 17:47:09 +0100 MIME-Version: 1.0 In-Reply-To: <20210506142526.28245-7-mk@semihalf.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v3 06/22] net/ena/base: destroy multiple "wait events" 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 Sender: "dev" On 5/6/2021 3:25 PM, Michal Krawczyk wrote: > Although the ENA DPDK PMD doesn't have to perform any actions for > destroying the wait event, some other platforms have to. > > The macro "ENA_WAIT_EVENT_DESTROY" was renamed to > "ENA_WAIT_EVENTS_DESTROY" and also whole implementation responsible for > that was moved to a separate function for better readability. > > Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") > > Signed-off-by: Michal Krawczyk > Reviewed-by: Igor Chauskin > Reviewed-by: Guy Tzalik > --- > drivers/net/ena/base/ena_com.c | 24 +++++++++++++++++------- > drivers/net/ena/base/ena_plat_dpdk.h | 4 ++-- > 2 files changed, 19 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c > index 0cdeb1a2d9..d025c9cee1 100644 > --- a/drivers/net/ena/base/ena_com.c > +++ b/drivers/net/ena/base/ena_com.c > @@ -1671,6 +1671,22 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev) > return 0; > } > > +static void > +ena_com_free_ena_admin_queue_comp_ctx(struct ena_com_dev *ena_dev, > + struct ena_com_admin_queue *admin_queue) > + > +{ > + if (!admin_queue->comp_ctx) > + return; > + > + ENA_WAIT_EVENTS_DESTROY(admin_queue); I can see both 'ENA_WAIT_EVENT_DESTROY' & 'ENA_WAIT_EVENTS_DESTROY' does nothing but, according their definitions: +#define ENA_WAIT_EVENT_DESTROY(admin_queue) ((void)(admin_queue)) +#define ENA_WAIT_EVENTS_DESTROY(waitqueue) ((void)(waitqueue) If 'ENA_WAIT_EVENTS_DESTROY' also gets 'admin_queue' as parameter, does it make sense to update the definition of it to get 'admin_queue', like: #define ENA_WAIT_EVENTS_DESTROY(admin_queue) ((void)(admin_queue) And I can see that is updated in next patches, so may be better to update here. > + ENA_MEM_FREE(ena_dev->dmadev, > + admin_queue->comp_ctx, > + (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); > + > + admin_queue->comp_ctx = NULL; > +} > + > void ena_com_admin_destroy(struct ena_com_dev *ena_dev) > { > struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue; > @@ -1679,14 +1695,8 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) > struct ena_com_aenq *aenq = &ena_dev->aenq; > u16 size; > > - if (admin_queue->comp_ctx) { > - ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event); > - ENA_MEM_FREE(ena_dev->dmadev, > - admin_queue->comp_ctx, > - (admin_queue->q_depth * sizeof(struct ena_comp_ctx))); > - } > + ena_com_free_ena_admin_queue_comp_ctx(ena_dev, admin_queue); > > - admin_queue->comp_ctx = NULL; > size = ADMIN_SQ_SIZE(admin_queue->q_depth); > if (sq->entries) > ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, sq->entries, > diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h > index 231d44e0e0..ad7b07b374 100644 > --- a/drivers/net/ena/base/ena_plat_dpdk.h > +++ b/drivers/net/ena/base/ena_plat_dpdk.h > @@ -166,7 +166,7 @@ extern int ena_logtype_com; > #define ENA_WAIT_EVENT_SIGNAL(waitevent) pthread_cond_signal(&waitevent.cond) > /* pthread condition doesn't need to be rearmed after usage */ > #define ENA_WAIT_EVENT_CLEAR(...) > -#define ENA_WAIT_EVENT_DESTROY(waitqueue) ((void)(waitqueue)) > +#define ENA_WAIT_EVENT_DESTROY(admin_queue) ((void)(admin_queue)) > > #define ena_wait_event_t ena_wait_queue_t > #define ENA_MIGHT_SLEEP() > @@ -298,7 +298,7 @@ extern rte_atomic32_t ena_alloc_cnt; > #define ENA_TIME_EXPIRE(timeout) (timeout < rte_get_timer_cycles()) > #define ENA_GET_SYSTEM_TIMEOUT(timeout_us) \ > (timeout_us * rte_get_timer_hz() / 1000000 + rte_get_timer_cycles()) > -#define ENA_WAIT_EVENT_DESTROY(waitqueue) ((void)(waitqueue)) > +#define ENA_WAIT_EVENTS_DESTROY(waitqueue) ((void)(waitqueue)) > > #ifndef READ_ONCE > #define READ_ONCE(var) (*((volatile typeof(var) *)(&(var)))) >