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 38273A0548; Sun, 9 May 2021 16:18:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB711406FF; Sun, 9 May 2021 16:18:08 +0200 (CEST) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by mails.dpdk.org (Postfix) with ESMTP id 413D140140 for ; Sun, 9 May 2021 16:18:07 +0200 (CEST) Received: by mail-io1-f42.google.com with SMTP id o21so11975611iow.13 for ; Sun, 09 May 2021 07:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=jrh1UJCDe+8skUvwlhgehMcE/MDNsuxrHqCjq41NufA=; b=VrgtMVBSXBWtGAbI4lXVWlnSxoUFs0Drgfhd6S79AOuWc5BO5KeggXQ/7XAm/WfBUV KzgF2Bkj6Xf3u5drGSi2OUD8Pcgd5qY5Qc9j/PiVacCxTfTMjNgGp5fZ2uYG+ylC6LxR xyR6w7PJAHNHFox0VkMcLMNOxIzKV+J80F7MpkVYQjeBFexn6UJgHLLorRPhNfnemngx M4LgTKR3H0+WR7wfSt5q9Q8B8wpouRVNz/+MEqCDAzVDHMyMhHsVS6M/f+kkJWGciI5d ak6+kDva52WeneQ9SpaTaS8vPlmutzNW59DvASUIZ1qmOQVkDtLtDJTwoq2CEviC1jP9 ++DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=jrh1UJCDe+8skUvwlhgehMcE/MDNsuxrHqCjq41NufA=; b=cpoIUZeGA4xn5eL7noBDWYQd3E56ie1tfrPJsRHoT2tYObAPr52T1nVi/6e/CLrQgR HMRW0Iw4Dl+d7ooziwN4qmb63ggX1+cQv6+rsp2FD7qUi9fDTQeHQ0wfyj9qGHxhk7yU 2gJ+BViOTROdrNkYLKVIzN+lPLyLPjOasNRWXvddhWYAhX3MdWJ5F88pWb4Quq8p/dDV 1a+sJxaqm+2IM/ZgZY0p9yRWxARYNj5ohbv+dVCsBTPUVmeUGT2dIZtPPGk0TjDh+uFv hu4zWdnwiANlMzVfnIcZBgb+XoaxLLFNgEwYLowLgLOgRM7TUME8fJ9tfG3Q0Cigd9DF 3z9w== X-Gm-Message-State: AOAM531fFQnuFmshDuTbe3lC7znMV8dnU4rYNnRc1PrKLTVGrJJ44mz9 lO12oCTGMSFDhwNVuhQgO8dX/XxGW6m10m35XKTqYw== X-Google-Smtp-Source: ABdhPJwsRqPDlYfQJ66Z/oqlIShAbB127vqAH+5YycjVFaMKwoezP897wRZ/dKeZpP8bLD1LJ+njfbfneLN9s8sKpEc= X-Received: by 2002:a05:6638:cad:: with SMTP id x13mr17744724jad.40.1620569886548; Sun, 09 May 2021 07:18:06 -0700 (PDT) MIME-Version: 1.0 References: <20210505073348.6394-1-mk@semihalf.com> <20210506142526.28245-1-mk@semihalf.com> <20210506142526.28245-7-mk@semihalf.com> <6fb65511-fca0-bf2d-98eb-9daddeb669de@intel.com> In-Reply-To: <6fb65511-fca0-bf2d-98eb-9daddeb669de@intel.com> From: =?UTF-8?Q?Micha=C5=82_Krawczyk?= Date: Sun, 9 May 2021 16:17:54 +0200 Message-ID: To: Ferruh Yigit Cc: dev , "Dagan, Noam" , "Tzalik, Guy" , "Chauskin, Igor" , upstream@semihalf.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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" pt., 7 maj 2021 o 18:47 Ferruh Yigit napisa=C5=82(= a): > > 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_q= ueue) > > + > > +{ > > + 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 i= t 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. > I agree, the ENA_WAIT_EVENTS_DESTROY() should take as an argument admin_queue. The ENA_WAIT_EVENT_DESTROY shouldn't be touched by this patch. I will fix that in v4. > > + ENA_MEM_FREE(ena_dev->dmadev, > > + admin_queue->comp_ctx, > > + (admin_queue->q_depth * sizeof(struct ena_comp_ctx))= ); > > + > > + admin_queue->comp_ctx =3D NULL; > > +} > > + > > void ena_com_admin_destroy(struct ena_com_dev *ena_dev) > > { > > struct ena_com_admin_queue *admin_queue =3D &ena_dev->admin_queue= ; > > @@ -1679,14 +1695,8 @@ void ena_com_admin_destroy(struct ena_com_dev *e= na_dev) > > struct ena_com_aenq *aenq =3D &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_co= mp_ctx))); > > - } > > + ena_com_free_ena_admin_queue_comp_ctx(ena_dev, admin_queue); > > > > - admin_queue->comp_ctx =3D NULL; > > size =3D 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/bas= e/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(&waiteven= t.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)))) > > >