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 09912A0C41; Thu, 30 Sep 2021 15:00:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E80BC410E5; Thu, 30 Sep 2021 15:00:17 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id D64F240DDA for ; Thu, 30 Sep 2021 15:00:15 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="225255422" X-IronPort-AV: E=Sophos;i="5.85,336,1624345200"; d="scan'208";a="225255422" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2021 06:00:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,336,1624345200"; d="scan'208";a="520366775" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by fmsmga008.fm.intel.com with ESMTP; 30 Sep 2021 06:00:04 -0700 From: Ganapati Kundapura To: jerinjacobk@gmail.com, dev@dpdk.org Cc: jay.jayatheerthan@intel.com Date: Thu, 30 Sep 2021 08:00:01 -0500 Message-Id: <20210930130001.430924-1-ganapati.kundapura@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210930124712.424427-1-ganapati.kundapura@intel.com> References: <20210930124712.424427-1-ganapati.kundapura@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2] eventdev/rx-adapter: segfault in queue conf get 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" rte_event_eth_rx_adapter_queue_conf_get() segfaults if called without queue added to the Rx adapter. Added check to no queues in Rx adapter and error out on being called with no queue in Rx adapter. Added test case to call queue conf get without queues in Rx adapter. Signed-off-by: Ganapati Kundapura --- v2: * Corrected typo in the comment --- diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c index 13664a3..d0dc552 100644 --- a/app/test/test_event_eth_rx_adapter.c +++ b/app/test/test_event_eth_rx_adapter.c @@ -751,20 +751,48 @@ static int adapter_queue_conf(void) { int err; - struct rte_event_eth_rx_adapter_queue_conf queue_conf; + struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0}; - err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, TEST_DEV_ID, + /* Case 1: queue conf get without any queues in Rx adapter */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, &queue_conf); + TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + + /* Add queue to Rx adapter */ + queue_conf.ev.queue_id = 0; + queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC; + queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL; + + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, &queue_conf); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + /* Case 2: queue conf get with queue added to Rx adapter */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, 0, &queue_conf); TEST_ASSERT(err == 0, "Expected 0 got %d", err); - err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, TEST_DEV_ID, + /* Case 3: queue conf get with invalid rx queue id */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, -1, &queue_conf); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); - err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, TEST_DEV_ID, + /* Case 4: queue conf get with NULL queue conf struct */ + err = rte_event_eth_rx_adapter_queue_conf_get(TEST_INST_ID, + TEST_ETHDEV_ID, 0, NULL); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); + /* Delete queue from the Rx adapter */ + err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + return TEST_SUCCESS; } diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index 10491ca..2a84490 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -2844,12 +2844,13 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, return -EINVAL; dev_info = &rx_adapter->eth_devices[eth_dev_id]; - queue_info = &dev_info->rx_queue[rx_queue_id]; - if (!queue_info->queue_enabled) { + if (dev_info->rx_queue == NULL || + !dev_info->rx_queue[rx_queue_id].queue_enabled) { RTE_EDEV_LOG_ERR("Rx queue %u not added", rx_queue_id); return -EINVAL; } + queue_info = &dev_info->rx_queue[rx_queue_id]; qi_ev = (struct rte_event *)&queue_info->event; memset(queue_conf, 0, sizeof(*queue_conf)); -- 2.6.4