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 4100C42DA6 for ; Sat, 15 Jul 2023 00:35:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39A6140EDC; Sat, 15 Jul 2023 00:35:32 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 52D2140DFB for ; Sat, 15 Jul 2023 00:35:30 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3fbef8ad9bbso21540845e9.0 for ; Fri, 14 Jul 2023 15:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374130; x=1691966130; 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=Hn+wJCvGgfgGDU/jej2AksgVjHhrcFWQpqJNayal02Q=; b=gjB7v4j8QQRQVtJHogHSQ4AhBiTS+xffUKQTs/2ZYs7u72UQcvMVTHF9UGSq5fwD78 6qvltHexNINzuzs4r/LlXr6LaGD4gh46beS9pFkCTyJWc4hjbVW6ZhoZDXxWUe+MNVvT gsULkQGLljXSrpbMYxhgtOhWCMMUumIbuq4D+5wBThmp/0GiGAk/R41nqqeNQsVSjVAG 3lnePslyyqJuIXJl3/MyRC8jqy1/i9xqcRyJuEqVt/jepW5yZUDP0IoYMejwP2Y+U21Q mx/WdMSnFY6JpHUpWgpuwqb5nsJdxyGUagY1fpUNLeReV3wcjVNgvdCjO0TQsGtyk3i4 WJJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374130; x=1691966130; 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=Hn+wJCvGgfgGDU/jej2AksgVjHhrcFWQpqJNayal02Q=; b=IP6wUE+g0iROa5osIHGiDmrx74/IyVv82Ts7f7NBhnkJWdQXYDStu7g/83rr+IYL79 cg4XFyql1HE7l1rFsw2W3l18Pm06dqCZ8mlwsccdGygnDrY+8pQ1+TFk5Vkx2t3efkTy Jr+MbJ7xRCOhvGfzHUOhL7HoC/3KBO9/E602+gyi+E0MSXZnBNjMrlGDUwo29q6w0X2Z s/SVJyu9GkqFOJOFpCrna/V29Fb/Oj2+hFEMR4tNvAeIEpg/U5wD3+VLSvCbfBH26+Kf ZtfvwDafolxPIT/DHdlQh3qGh5myrNrXgHM/RSTokmvCEXcGOuKu10LksrwNedvZ8rM2 h8dA== X-Gm-Message-State: ABy/qLZb0ujZKYbr2MD41YOFP98qfRQCS/0TykaG0NtR3KSEuOJSPO5K yP/jX0IxFNM33wej/QEAghsxz/zdF9lsJwX2 X-Google-Smtp-Source: APBJJlGnIoJcupmtUGPhy3VdqI/Y9kKSTzSQ0I2n4778LQVMYcHdGEWADgrMktFgHGN52rewjPW4LA== X-Received: by 2002:a7b:c412:0:b0:3fa:71db:56ff with SMTP id k18-20020a7bc412000000b003fa71db56ffmr5126746wmi.40.1689374130000; Fri, 14 Jul 2023 15:35:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id 3-20020a05600c234300b003fc04d13242sm2317968wmq.0.2023.07.14.15.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/fpga_5gnr_fec: fix starting unconfigured queue' has been queued to stable release 20.11.9 Date: Fri, 14 Jul 2023 23:34:42 +0100 Message-Id: <20230714223447.1092828-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-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.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cc66c3e913846380edbba2d95171864f9212075a Thanks. Luca Boccassi --- >From cc66c3e913846380edbba2d95171864f9212075a 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 04c16f80fb..c68f552a0f 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -563,17 +563,21 @@ static int 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 + (sizeof(struct fpga_ring_ctrl_reg) * q->q_idx); 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 */ q->tail = q->head_free_desc = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:09.070705438 +0100 +++ 0013-baseband-fpga_5gnr_fec-fix-starting-unconfigured-que.patch 2023-07-14 23:33:08.503305419 +0100 @@ -1 +1 @@ -From 490501e6cbe48503aeadb20f89915a3949b70aa8 Mon Sep 17 00:00:00 2001 +From cc66c3e913846380edbba2d95171864f9212075a 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 04c16f80fb..c68f552a0f 100644 @@ -22 +23 @@ -@@ -567,17 +567,21 @@ static int +@@ -563,17 +563,21 @@ static int