From patchwork Fri Apr 7 06:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 125856 X-Patchwork-Delegate: jerinj@marvell.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 404F6428E3; Fri, 7 Apr 2023 08:47:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 196A040DDB; Fri, 7 Apr 2023 08:47:41 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 520CA40041 for ; Fri, 7 Apr 2023 08:47:39 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3374igCI031620; Thu, 6 Apr 2023 23:47:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=OrUxRIcafr5jAgGJqRT8nl1c8Ctcnbr01Va1GE1fyn0=; b=Noj0mcKcBOLixmZjtq7hmV7TuIAPnDOtAetVH0gzY9sv+VMwJmz4uvlXUhoai80j8G8H /M1yhUQ7KwGyk6pGlC9n/kQ9XTtlFQK0EfFVkq4+TD7IUKcA4CxqmUn5c4QXb1mTKIAD RCRGfHXAk79D6+ct558LsEZZrqsS/o/3EnvBTM7i2EnFnJ0SvzVwxpe+rb+/jxaKKzS2 QmTA7dCuy1uP+pPJqA+t1SfgBX629aKfDacMEI/P0OZU1L6HlVziHQ2su/DOMhYqe5z2 JHD+BEmOZjpyPayl9UGdT/hVxyHxHMMCliDJD+KrwrHJGV6NtatVK3e+NHePuve26d/w hw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3ptcdnrjyn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 06 Apr 2023 23:47:38 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 6 Apr 2023 23:47:36 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 6 Apr 2023 23:47:36 -0700 Received: from MININT-80QBFE8.corp.innovium.com (unknown [10.28.164.122]) by maili.marvell.com (Postfix) with ESMTP id F0E753F7060; Thu, 6 Apr 2023 23:47:34 -0700 (PDT) From: To: , Naga Harish K S V CC: , Pavan Nikhilesh Subject: [PATCH v3] eventdev/eth_rx: fix invalid memory access Date: Fri, 7 Apr 2023 12:17:32 +0530 Message-ID: <20230407064732.891-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230405094332.2862-1-pbhagavatula@marvell.com> References: <20230405094332.2862-1-pbhagavatula@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 9Muq-oa72Hlam0V4o95P8ftk-t5EaAv8 X-Proofpoint-ORIG-GUID: 9Muq-oa72Hlam0V4o95P8ftk-t5EaAv8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-07_04,2023-04-06_03,2023-02-09_01 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 From: Pavan Nikhilesh Rx adapter internal service structures are only initialized when non-internal port is added to the adapter. Check if Rx adapter service is initialized to determine if runtime set/get parameters are supported. Fixes: 3716f52186af ("eventdev/eth_rx: support runtime set/get parameters") Signed-off-by: Pavan Nikhilesh Acked-by: Naga Harish K S V --- v3 Changes: ---------- - Teardown queue when test is not supported. v2 Changes: ---------- - Remove unused variables. - Fix spell check. app/test/test_event_eth_rx_adapter.c | 10 ++++++++-- lib/eventdev/rte_event_eth_rx_adapter.c | 24 ++++-------------------- 2 files changed, 12 insertions(+), 22 deletions(-) -- 2.25.1 diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c index cfe6052d7e..52d146f97c 100644 --- a/app/test/test_event_eth_rx_adapter.c +++ b/app/test/test_event_eth_rx_adapter.c @@ -1201,7 +1201,7 @@ adapter_intrq_instance_get(void) static int adapter_get_set_params(void) { - int err; + int err, rc; struct rte_event_eth_rx_adapter_runtime_params in_params; struct rte_event_eth_rx_adapter_runtime_params out_params; struct rte_event_eth_rx_adapter_queue_conf queue_config = {0}; @@ -1230,6 +1230,10 @@ adapter_get_set_params(void) /* Case 1: Get the default value of mbufs processed by Rx adapter */ err = rte_event_eth_rx_adapter_runtime_params_get(TEST_INST_ID, &out_params); + if (err == -ENOTSUP) { + rc = TEST_SKIPPED; + goto skip; + } TEST_ASSERT(err == 0, "Expected 0 got %d", err); /* Case 2: Set max_nb_rx = 32 (=BATCH_SEIZE) */ @@ -1302,11 +1306,13 @@ adapter_get_set_params(void) "Expected %u got %u", in_params.max_nb_rx, out_params.max_nb_rx); + rc = TEST_SUCCESS; +skip: 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; + return rc; } static struct unit_test_suite event_eth_rx_tests = { diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index c1cd124002..a8a5564b65 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -3466,30 +3466,14 @@ rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, static int rxa_caps_check(struct event_eth_rx_adapter *rxa) { - uint16_t eth_dev_id; - uint32_t caps = 0; - int ret; - if (!rxa->nb_queues) return -EINVAL; - /* The eth_dev used is always of same type. - * Hence eth_dev_id is taken from first entry of poll array. - */ - eth_dev_id = rxa->eth_rx_poll[0].eth_dev_id; - ret = rte_event_eth_rx_adapter_caps_get(rxa->eventdev_id, - eth_dev_id, - &caps); - if (ret) { - RTE_EDEV_LOG_ERR("Failed to get adapter caps edev %" PRIu8 - "eth port %" PRIu16, rxa->eventdev_id, eth_dev_id); - return ret; - } - - if (caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) - return -ENOTSUP; + /* Check if there is at least one non-internal ethernet port. */ + if (rxa->service_inited) + return 0; - return 0; + return -ENOTSUP; } int