From patchwork Thu May 25 18:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 127501 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3A2A42B9E; Thu, 25 May 2023 20:31:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6939A42D32; Thu, 25 May 2023 20:31:22 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 8D13540DDB; Thu, 25 May 2023 20:31:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685039479; x=1716575479; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aEWXBvCy0Kc7EtA8UAFV50eYLnYusCj33VtmSprBoyo=; b=l8ziXfbRmV6a2nXx/nMxE6SLZhvfsvqo34MunnbvgMj61XqbUort0RV6 zX4BncyjdVuBWYSZWhtrFBmSN6vfMv3RUryfpG3HwxVTxQ5OuqkEF+Nt8 PJOAskeuuagQXy6EoxwI6pfxhCi3ItJ5lT5FHRR+7tmOy+77sxB8XoVxO xUahiVcZAGzQogbqy+rDsCzHUpR4bIhekwng4QVl+Zdp/ocuKL55GK21U AA3LsNEIvnfbtBK7i7JE+jJRbCUJKxdvfvTm1Tyx9LDB2VGrgxhscb+55 2YGvB6J5FN3YOD74fhrRkFwYILVEE8hrY6DPTwZysqs1Gy72T2bWSgbZ/ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10721"; a="357236177" X-IronPort-AV: E=Sophos;i="6.00,191,1681196400"; d="scan'208";a="357236177" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2023 11:29:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10721"; a="1035044099" X-IronPort-AV: E=Sophos;i="6.00,191,1681196400"; d="scan'208";a="1035044099" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by fmsmga005.fm.intel.com with ESMTP; 25 May 2023 11:29:18 -0700 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas , stable@dpdk.org Subject: [PATCH v2 2/6] baseband/fpga_5gnr_fec: fix seg fault unconf queue Date: Thu, 25 May 2023 11:28:08 -0700 Message-Id: <20230525182812.152907-3-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230525182812.152907-1-hernan.vargas@intel.com> References: <20230525182812.152907-1-hernan.vargas@intel.com> MIME-Version: 1.0 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 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") Cc: stable@dpdk.org Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 99390c48160c..6b0644ffc5d6 100644 --- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c @@ -567,17 +567,21 @@ static int fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id) { struct fpga_5gnr_fec_device *d = dev->data->dev_private; + 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 - 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; + 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;