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 A1A4642AE1 for ; Wed, 17 May 2023 12:36:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 913AE4114A; Wed, 17 May 2023 12:36:02 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id E931B4067B; Wed, 17 May 2023 12:36:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684319761; x=1715855761; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3yuZe/pTjEyg35eXWf/zJplbeoRAOD7IMsDNbvZNyiw=; b=Vc1NCv+hVhEshpemzr7Jg9k3lmQ8Ly+5U9kWtQIwq+ieIZhUEyBrO7lj JxZ1fO2eNlGFPE+TdIvlSQIJsF4Pzw3vlYUH2I3IdpFgX4jXIwNgSFnbH AWvQteZ52oN9dPVwWqTpzANGuYCzqw8r/rSUka3xyjtD4JRbFuYE2nCvd Yx6amZbKoE+B1gvJWxt7w0uWWNSWNyFW2tuCYdd6+AfM9h5ux3SjjeqBJ B6eUSvMJ9rRxuaoHLvPCfx7XDQ4t9FvaLZVfy2vf0W2ZSWPBSXaMs5lDW mzi/lByFF6VMvM5QUv7faftsm/6GJJV0W2QdFHfXGOCRPwngGc0TnPMuH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="354892482" X-IronPort-AV: E=Sophos;i="5.99,281,1677571200"; d="scan'208";a="354892482" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2023 03:35:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="695819254" X-IronPort-AV: E=Sophos;i="5.99,281,1677571200"; d="scan'208";a="695819254" Received: from txandevlnx322.an.intel.com ([10.123.117.44]) by orsmga007.jf.intel.com with ESMTP; 17 May 2023 03:35:53 -0700 From: Naga Harish K S V To: jerinj@marvell.com Cc: dev@dpdk.org, jay.jayatheerthan@intel.com, stable@dpdk.org Subject: [PATCH v3] eventdev/eth_tx: fix runtime parameter test Date: Wed, 17 May 2023 05:35:51 -0500 Message-Id: <20230517103551.3334611-1-s.v.naga.harish.k@intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20230502055711.1133134-1-s.v.naga.harish.k@intel.com> References: <20230502055711.1133134-1-s.v.naga.harish.k@intel.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 TX adapter capability check logic is simplified. The UT has been updated to skip the test, if the API to set runtime parameters is not supported. Fixes: 1d176c7add08 ("eventdev/eth_tx: support runtime set/get parameters") Cc: stable@dpdk.org Signed-off-by: Naga Harish K S V --- v3: * address review comments in commit message v2: * update tx_adapter unit test --- app/test/test_event_eth_tx_adapter.c | 11 ++++++--- lib/eventdev/rte_event_eth_tx_adapter.c | 33 +++++-------------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c index 4e1d821bf9..616c972ac0 100644 --- a/app/test/test_event_eth_tx_adapter.c +++ b/app/test/test_event_eth_tx_adapter.c @@ -800,13 +800,17 @@ tx_adapter_queue_start_stop(void) static int tx_adapter_set_get_params(void) { - int err; + int err, rc; struct rte_event_eth_tx_adapter_runtime_params in_params; struct rte_event_eth_tx_adapter_runtime_params out_params; err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, 0); + if (err == -ENOTSUP) { + rc = TEST_SKIPPED; + goto skip; + } TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_tx_adapter_runtime_params_init(&in_params); @@ -916,13 +920,14 @@ tx_adapter_set_get_params(void) TEST_ASSERT(in_params.flush_threshold == out_params.flush_threshold, "Expected %u got %u", in_params.flush_threshold, out_params.flush_threshold); - + rc = TEST_SUCCESS; +skip: err = rte_event_eth_tx_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 int diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c index 131e11e01d..360d5caf6a 100644 --- a/lib/eventdev/rte_event_eth_tx_adapter.c +++ b/lib/eventdev/rte_event_eth_tx_adapter.c @@ -1310,36 +1310,15 @@ rte_event_eth_tx_adapter_runtime_params_init( } static int -txa_caps_check(uint8_t id, struct txa_service_data *txa) +txa_caps_check(struct txa_service_data *txa) { - uint32_t caps = 0; - struct rte_eth_dev *eth_dev = NULL; - struct txa_service_ethdev *tdi; - int i; - if (!txa->dev_count) return -EINVAL; - /* The eth_dev used is always the same type. - * Hence first valid eth_dev is taken. - */ - for (i = 0; i < txa->dev_count; i++) { - tdi = &txa->txa_ethdev[i]; - if (tdi->nb_queues) { - eth_dev = tdi->dev; - break; - } - } - if (eth_dev == NULL) - return -EINVAL; - - if (txa_dev_caps_get(id)) - txa_dev_caps_get(id)(txa_evdev(id), eth_dev, &caps); - - if (caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT) - return -ENOTSUP; + if (txa->service_id != TXA_INVALID_SERVICE_ID) + return 0; - return 0; + return -ENOTSUP; } int @@ -1361,7 +1340,7 @@ rte_event_eth_tx_adapter_runtime_params_set(uint8_t id, if (txa == NULL) return -EINVAL; - ret = txa_caps_check(id, txa); + ret = txa_caps_check(txa); if (ret) return ret; @@ -1392,7 +1371,7 @@ rte_event_eth_tx_adapter_runtime_params_get(uint8_t id, if (txa == NULL) return -EINVAL; - ret = txa_caps_check(id, txa); + ret = txa_caps_check(txa); if (ret) return ret; -- 2.23.0