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 94B70A0C4D; Wed, 6 Oct 2021 19:32:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6541840685; Wed, 6 Oct 2021 19:32:52 +0200 (CEST) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by mails.dpdk.org (Postfix) with ESMTP id 5002A4067A for ; Wed, 6 Oct 2021 19:32:51 +0200 (CEST) Received: by mail-il1-f175.google.com with SMTP id i13so3663099ilm.4 for ; Wed, 06 Oct 2021 10:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wDG7+e/G+Vz3fwI11sWj9zzv4sSHPWtJdmc9IlbveWI=; b=gX7A1A+CirXnMqxfqIqfETsiDqNowb+3FLvCYix0HyaTmPZGv/0x+baiZXq27+N3V4 4LpFnkBHNIRwl7wpdviRVxswMLsSkkhjPi8EJoZ9YCbRqTokJy8DcK2QCXLkuhHfUP+m i4rLir7qdwQ8BktY6GToi1liQf/cvj/HUXg1V4dXF289hl1zA2mbEVBUiQq9umEAoMDD CNkJIUnvL+7sAxMXVp3sTFGJJYZZZ1dAIJWfqfOXfEbOxdk6t9aklpjB01+3tw9jLUBq erOW9gKEz+ozmovIKtR1r9TlfBim29uGe7g2k6R54/XGXMcZENuwQdAoTkmbpuIqLQBI 1GAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wDG7+e/G+Vz3fwI11sWj9zzv4sSHPWtJdmc9IlbveWI=; b=BxZhHHBbcTW2b7gAwx0xwbqWwM+f0ELfKMsjh0/R50SibD+teW2oeWWoEYqwFyFlsc z8mj5lJmPZl1Xy2tE/iAo26M5QzMAHEGecHLfiMYsYgpuxUDP9NrCyZXF40XviS7tgwq zP14B5VrC7VI9JL0p/VW7tXXbgfT3rVaKh85C7RF/LQE1qsljzf/IWxk2AAgg0PluC55 yTsSR7wbV+YD1u+CzH6Ys9YNtzW1lfKwDmUx+mSK2yprP/BCEyuH0RVY9rZtaD2OeIc/ RIsjG61roXqKYrtesWyOpqy3ZWpv4m5rk2Is+v8KIqVRoS/AVY81uNxS/MhaeXk7Vd9l i/9A== X-Gm-Message-State: AOAM531FLCwqwfyp4247ZQcXCJWYt0HHENJvbh0U+/hrw/QWJS2wX2fN zzVUpZNxSrCwOGVsJ87pXS4Go4ESB66ksl+ydto= X-Google-Smtp-Source: ABdhPJzLuNmUFMLQT6M69ubzoE7zPufw1TsnG3zNMPCu9ZXTgIwG4kGSLxl2Ik7UamLDPnc+XJNUhuz+R0R8KfV0GQI= X-Received: by 2002:a05:6e02:1bef:: with SMTP id y15mr8753028ilv.295.1633541570636; Wed, 06 Oct 2021 10:32:50 -0700 (PDT) MIME-Version: 1.0 References: <20211001051954.1055473-1-ganapati.kundapura@intel.com> <20211001053000.1063729-1-ganapati.kundapura@intel.com> In-Reply-To: <20211001053000.1063729-1-ganapati.kundapura@intel.com> From: Jerin Jacob Date: Wed, 6 Oct 2021 23:02:24 +0530 Message-ID: To: Ganapati Kundapura Cc: dpdk-dev , "Jayatheerthan, Jay" Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v4] eventdev/rx-adapter: fix 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" On Fri, Oct 1, 2021 at 11:00 AM Ganapati Kundapura wrote: > > 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. > > Fixes: b36879759b7f3ce ("eventdev/rx_adapter: support Rx queue config get") Squashed to relevant patches to dpdk-next-net-eventdev/for-main. Thanks > Signed-off-by: Ganapati Kundapura > > --- > v4: > * Fixed checkpatch warning > > v3: > * Added fixes line > > 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 >