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 5528D42ECF for ; Thu, 20 Jul 2023 17:36:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51B9440685; Thu, 20 Jul 2023 17:36:02 +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 B9A84400D6 for ; Thu, 20 Jul 2023 17:36:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867360; 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=KQQueRbqzzAyQlSEYOAGt9B0cLboNH9elUk6Z4Oqi00=; b=IdkwgEuRIpLapxsssPEnfzW2EkltoIizU8+MzTiGO76Eb7zILBmOhEp0YrCt6tP7LjlG4K 6vyf56eJ0sYRQs8omp14x6YqOziIRo9piIG6NYI3ZZdpaqkMTirOSHQ41zw7kMmX+5c8im OLX7A1T7YUNmuDcqF39xj7kmKKvJR2I= Received: from mimecast-mx02.redhat.com (66.187.233.88 [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-481-CuYQ4ZG3MciflTucPnNK6Q-1; Thu, 20 Jul 2023 11:23:48 -0400 X-MC-Unique: CuYQ4ZG3MciflTucPnNK6Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E3B6F83DD1F; Thu, 20 Jul 2023 15:23:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9D11492C13; Thu, 20 Jul 2023 15:23:19 +0000 (UTC) From: Kevin Traynor To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/fpga_5gnr_fec: fix starting unconfigured queue' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:25 +0100 Message-ID: <20230720151942.262154-134-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/fac6cde16cff15abceb711d6fd268ab850f8ff7c Thanks. Kevin --- >From fac6cde16cff15abceb711d6fd268ab850f8ff7c Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 25 May 2023 11:28:08 -0700 Subject: [PATCH] baseband/fpga_5gnr_fec: fix starting unconfigured queue [ upstream commit 490501e6cbe48503aeadb20f89915a3949b70aa8 ] Adding exception to prevent segmentation fault in case a queue is started which was not configured earlier. Fixes: c58109a8871d ("baseband/fpga_5gnr_fec: add queue configuration") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- .../baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c index 60b86bebbd..6931884901 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -565,10 +565,4 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) { struct fpga_5gnr_fec_device *d = dev->data->dev_private; -#ifdef RTE_LIBRTE_BBDEV_DEBUG - if (d == NULL) { - rte_bbdev_log(ERR, "Invalid device pointer"); - return -1; - } -#endif struct fpga_queue *q = dev->data->queues[queue_id].queue_private; uint32_t offset = FPGA_5GNR_FEC_RING_CTRL_REGS + @@ -576,4 +570,14 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) uint8_t enable = 0x01; uint16_t zero = 0x0000; +#ifdef RTE_LIBRTE_BBDEV_DEBUG + if (d == NULL) { + rte_bbdev_log(ERR, "Invalid device pointer"); + return -1; + } +#endif + if (dev->data->queues[queue_id].queue_private == NULL) { + rte_bbdev_log(ERR, "Cannot start invalid queue %d", queue_id); + return -1; + } /* Clear queue head and tail variables */ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.903111834 +0100 +++ 0134-baseband-fpga_5gnr_fec-fix-starting-unconfigured-que.patch 2023-07-20 16:17:55.208752742 +0100 @@ -1 +1 @@ -From 490501e6cbe48503aeadb20f89915a3949b70aa8 Mon Sep 17 00:00:00 2001 +From fac6cde16cff15abceb711d6fd268ab850f8ff7c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 490501e6cbe48503aeadb20f89915a3949b70aa8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 99390c4816..6b0644ffc5 100644 +index 60b86bebbd..6931884901 100644 @@ -22 +23 @@ -@@ -568,10 +568,4 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) +@@ -565,10 +565,4 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) @@ -33 +34 @@ -@@ -579,4 +573,14 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) +@@ -576,4 +570,14 @@ fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id)