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 6646FA0524; Thu, 6 May 2021 16:26:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48B464112C; Thu, 6 May 2021 16:25:53 +0200 (CEST) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mails.dpdk.org (Postfix) with ESMTP id 082D941127 for ; Thu, 6 May 2021 16:25:51 +0200 (CEST) Received: by mail-lf1-f44.google.com with SMTP id x20so8077122lfu.6 for ; Thu, 06 May 2021 07:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tULt3E1XAtUcgcortfM3qcqYzItJQ8ZfzTHXKhIBhSk=; b=Kcn3Xil2nzASvskd3OCDIEeHfKyDLvlsL5qUK0MmY68N/XZYONreehWpJOah/bA8nA xdeca35Ks4NuoE3K03lQeh0FMCBLET8IVsm4hxsV5MPKfd0nN8NjDfYKRAwB11Xs4eYY mLM0tEZrdILMFFa3KFgnwmEcDr4mIWJPPeeYYMc8DUl5M7TrReyyzVU9mQb2ATn3X7oc uCvAuoDk5EkYaKfymk5kM7F47+JgX9QVS9t+9qT3TOMVsJ8y5bdKsLMmpX9Nf71vqzVh 2skjOhVGpax+NGuyBhiiCe4ffxyPxdefTB0wcYsd1WKHR1H9lMRSjCfk8d8q4MiL9Pyq EyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tULt3E1XAtUcgcortfM3qcqYzItJQ8ZfzTHXKhIBhSk=; b=FF04jzl3OSjZeY9G5nUweR4C4cnq/gPaMLE7u+rjaay8RPPK0t5vb4DWejq/KABgqn d4seITm+3PPQRl5si9WgB3m4jZ9RhYELMmiiO38jIPKiDLJM7Fw8AE5Y6/AooLEiqKe/ toI67ERR9CjtLGB1INEs9g2OYo6tRI/4FeT2BS+0eoUiNhKSz7I4awaQyn98rcycwIhe NvqaMT2weQIrrlAhdvQUsTNq4OImgaMpuz5E3GbIjQUDbxKHa5d3ll7g+W7gvbZlgWvB u8zmGdBIS7RuCLMuclpcBr7X6kvtqo3cydAvmpM371GNw0kvnROSZiwlidunEid0EkY8 lgbQ== X-Gm-Message-State: AOAM531FDHDoz8Ly8R0k50mi1IGe1I/OVU2+CHxitYOmmapdCQp0q1nn K4tTkIsr8WO27ZSMuCEUSg4h2nGv7yMUFoyu X-Google-Smtp-Source: ABdhPJy1N51TAjINsLXGdxpPHtn/PkE4bglGnGQopH9UDFshPFWIHU4Y3hBwSD/PhGhnuHxftUj43A== X-Received: by 2002:a05:6512:3b22:: with SMTP id f34mr3002748lfv.361.1620311150277; Thu, 06 May 2021 07:25:50 -0700 (PDT) Received: from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl. [89.79.189.199]) by smtp.gmail.com with ESMTPSA id b40sm892908ljr.101.2021.05.06.07.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 07:25:49 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com, upstream@semihalf.com, Michal Krawczyk Date: Thu, 6 May 2021 16:25:10 +0200 Message-Id: <20210506142526.28245-7-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210506142526.28245-1-mk@semihalf.com> References: <20210505073348.6394-1-mk@semihalf.com> <20210506142526.28245-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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" 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); + 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)))) -- 2.25.1