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 1A829A0543 for ; Sat, 5 Nov 2022 18:13:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1632942D2F; Sat, 5 Nov 2022 18:13:57 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 1E2ED42D33 for ; Sat, 5 Nov 2022 18:13:56 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id p16so4624397wmc.3 for ; Sat, 05 Nov 2022 10:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V8FzlmePIp2pSnr9AuDPVQXYclkEGb8l1c0CL9t0Xt8=; b=gaNb/uuf0k9cxOi4vU2tgCOdsb1CLIudexjb9lw6bdrkJ0nsVOIqqelN+Z/YkHiN1i j9eP/0JHa9UdrB24DEgG96tyru+BXdIzVqFKng7uv14A7Ml1wlsONqORPU1vuCqHNM+o 25ByKCDiGBKcRvr9bV8dp0YaQsuC2JT2EFASFplxoiATqKeGsmRVNhEbmxq10vXYk54z WwEMmRUKcdVXjTJYzM2LVfmcLGv9EQzRGMqCc1FmDyQ/qxO46lW7N8ds7nbZ+1ZBh9mt v4aZYBTs8LiWAPQ9xeCNchuOjZqHQNSc7rKd4+UfeMgcjnCVcg364aBWmm8iqnimH7Mp AR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V8FzlmePIp2pSnr9AuDPVQXYclkEGb8l1c0CL9t0Xt8=; b=QacIh/bEQsSCxNNQ88RF70fztWHt96rZrHF421xShBBGbNz14RxjtW2HD8V3KFuugH CzDLOmDLI/Zp0IfPWDd37ufYUM4y0miz8XRo8A3tWtxQDn1QOwelgkUohDxjtENlCsNq 13I5mn9uQT0KmlTcVyU54qgEng+2CvDoUa3b/DKSlxyX+7Od65h9jF/DSRAVHzRCd5sV +LSqtdYfUubQOuXATUiAYdghlXw/EkdPqnLwxJ9DetXytkLMZQ1rfwxG3oN3s3XGaBEL mD8coUAMOpu2xFWFWtydP7s2AmXVwP51BbosCVUKALWQ29R7YVzvQ+zvyH5sbyXDo5Wp gMUg== X-Gm-Message-State: ACrzQf1XByyOnMrbEIXfvgM/bShJv4rnRv6kLhUVTMkphHS2GL1XrDDl dY5gA4oFjcy70r7xMU57Q8Y= X-Google-Smtp-Source: AMsMyM6vyfGkgdgOnQl9Z18FOqgvXNtSymfuK3avzSpANxZ4f1WmGOPhNZTtnyazcy6pl+UXKdPr0Q== X-Received: by 2002:a05:600c:4451:b0:3c6:fb65:24cb with SMTP id v17-20020a05600c445100b003c6fb6524cbmr37145792wmn.144.1667668435888; Sat, 05 Nov 2022 10:13:55 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003cf75213bb9sm7047519wmo.8.2022.11.05.10.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: fix ring/queue allocation' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:39 +0000 Message-Id: <20221105171146.1520039-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5503b5fe28410161287736714ebb3c38320dbc29 Thanks. Luca Boccassi --- >From 5503b5fe28410161287736714ebb3c38320dbc29 Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 20 Oct 2022 22:20:41 -0700 Subject: [PATCH] baseband/acc100: fix ring/queue allocation [ upstream commit e23491fc2e0028535891af85fcbfedc9b23b1149 ] 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") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 30 ++++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index 9bdf726f75..881ce71d66 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -569,9 +569,9 @@ allocate_info_ring(struct rte_bbdev *dev) reg_addr = &vf_reg_addr; /* Allocate InfoRing */ d->info_ring = rte_zmalloc_socket("Info Ring", - ACC100_INFO_RING_NUM_ENTRIES * - sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, - dev->data->socket_id); + ACC100_INFO_RING_NUM_ENTRIES * + sizeof(*d->info_ring), RTE_CACHE_LINE_SIZE, + dev->data->socket_id); if (d->info_ring == NULL) { rte_bbdev_log(ERR, "Failed to allocate Info Ring for %s:%u", @@ -660,7 +660,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) acc100_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); @@ -668,8 +669,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) rte_bbdev_log(ERR, "Failed to allocate tail ptr for %s:%u", dev->device->driver->name, dev->data->dev_id); - rte_free(d->sw_rings); - return -ENOMEM; + ret = -ENOMEM; + goto free_sw_rings; } d->tail_ptr_iova = rte_malloc_virt2iova(d->tail_ptrs); @@ -692,15 +693,16 @@ 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", ACC100_HARQ_LAYOUT * sizeof(*d->harq_layout), RTE_CACHE_LINE_SIZE, dev->data->socket_id); if (d->harq_layout == NULL) { rte_bbdev_log(ERR, "Failed to allocate harq_layout for %s:%u", dev->device->driver->name, dev->data->dev_id); - rte_free(d->sw_rings); - return -ENOMEM; + ret = -ENOMEM; + goto free_tail_ptrs; } /* Mark as configured properly */ @@ -709,8 +711,16 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) rte_bbdev_log_debug( "ACC100 (%s) configured sw_rings = %p, sw_rings_iova = %#" PRIx64, dev->data->name, d->sw_rings, d->sw_rings_iova); - return 0; + +free_tail_ptrs: + rte_free(d->tail_ptrs); + d->tail_ptrs = NULL; +free_sw_rings: + rte_free(d->sw_rings_base); + d->sw_rings = NULL; + + return ret; } static int -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:12.210879247 +0000 +++ 0040-baseband-acc100-fix-ring-queue-allocation.patch 2022-11-05 17:11:08.818945733 +0000 @@ -1 +1 @@ -From e23491fc2e0028535891af85fcbfedc9b23b1149 Mon Sep 17 00:00:00 2001 +From 5503b5fe28410161287736714ebb3c38320dbc29 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e23491fc2e0028535891af85fcbfedc9b23b1149 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/baseband/acc/rte_acc100_pmd.c | 30 ++++++++++++++++++--------- + drivers/baseband/acc100/rte_acc100_pmd.c | 30 ++++++++++++++++-------- @@ -18,5 +19,5 @@ -diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c -index 13a762cb80..b737374d71 100644 ---- a/drivers/baseband/acc/rte_acc100_pmd.c -+++ b/drivers/baseband/acc/rte_acc100_pmd.c -@@ -408,9 +408,9 @@ allocate_info_ring(struct rte_bbdev *dev) +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index 9bdf726f75..881ce71d66 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -569,9 +569,9 @@ allocate_info_ring(struct rte_bbdev *dev) @@ -26 +27 @@ -- ACC_INFO_RING_NUM_ENTRIES * +- ACC100_INFO_RING_NUM_ENTRIES * @@ -29 +30 @@ -+ ACC_INFO_RING_NUM_ENTRIES * ++ ACC100_INFO_RING_NUM_ENTRIES * @@ -35,2 +36,2 @@ -@@ -499,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); +@@ -660,7 +660,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) + acc100_reg_write(d, reg_addr->ring_size, value); @@ -45 +46 @@ -@@ -507,8 +508,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) +@@ -668,8 +669,8 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) @@ -56 +57 @@ -@@ -531,15 +532,16 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) +@@ -692,15 +693,16 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) @@ -63 +64 @@ - ACC_HARQ_LAYOUT * sizeof(*d->harq_layout), + ACC100_HARQ_LAYOUT * sizeof(*d->harq_layout), @@ -76 +77 @@ -@@ -548,8 +550,16 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id) +@@ -709,8 +711,16 @@ acc100_setup_queues(struct rte_bbdev *dev, uint16_t num_queues, int socket_id)