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 2984EA0548; Wed, 8 Jun 2022 06:26:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C72844021F; Wed, 8 Jun 2022 06:26:50 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 04DC94021D for ; Wed, 8 Jun 2022 06:26:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654662408; x=1686198408; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=bAzyJtuA2m/j+8yQ7znNXmOczULKirBbJ5Cnak3DX74=; b=WmXbmYv4RNPZIGUoWNLDrA8n9O3QF5sYYxRZLEAkqBbOVvyaDDLiUkh5 t+47lJ7GCbX8k7lJzIU/4TBylXuNJUSh1I9mX+Cvn1b7C9kurTotGE2KJ puiWF7iMbB1UcCMSwqnAkEC+c8WKyFUJw0FS9SUZgQhKssOAYuLQmkZYi eB8lwCsm7PvcJqgb3DZdfvt0p4QYFLlCNUWCjPCHczDfIEf0vJeOzapr9 pwFaNkehzOrPKG5Za0e2CJuggVZ7iC8Aedyb+Y5qBCgjvXpvXG/h/U6/W a8f/6vE56fHZxakiZJUxlZOTxfWXtEdlhuc8O7D4wmL7Ty9Q7vutI+S31 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10371"; a="338520496" X-IronPort-AV: E=Sophos;i="5.91,285,1647327600"; d="scan'208";a="338520496" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2022 21:26:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,285,1647327600"; d="scan'208";a="532937987" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga003.jf.intel.com with ESMTP; 07 Jun 2022 21:26:46 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 7 Jun 2022 21:26:46 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 7 Jun 2022 21:26:46 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.105) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 7 Jun 2022 21:26:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cEWCEKCaLd4ThwtNruAhB5CGVeNkW1q4XL8kBzrBsdqPw6/jPW4Y/MdOSMg5rMfnlSvmmchJT351a3fU8s3gHHgPHMnmOfZ/B7C8YkVz/qjAQG/cO9ai3O+HVdnoLWngJK/l1ubV3zeU1ttAyukCRjfRrVO2NC7Oj3+1b3BblVEBxH16nfj3X1eq8N/5Io5N9k7sy5hwLMxgEile6tWNavFMv1LLvaoFNRUuo3MyJ5bLnpwnKWAWjnTaPhxl7/ho4ohUq3dvTrPJXxjHliKj5FXURZBZO62zO88UEHxLpNlqmyh7s7YR9AY8MBMY+qBIRRL84oH6l9cmy1w9t8ZY5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zQ+LQ45l6D7ID/Y12iz+a0tfbs2/aOK8iEaeF6TG0IQ=; b=ALYGVoOxz2JxZkzrtUiYBP/PC8WNdhbbkdkiFfFtfIQPXLW2o4l8SaapSiyWdW9BeRI0YTMecAqOw+3S8ZI6JDEJABEY7cP3avFqrN3qkNzhMKCr/VEPijYCPoddpEmYZHbOTWMs1W7k8wHRi1u/TVW9mjyybNn35wbR25qzAwLAW2vt3R9tHdDgxWbMK4I54VWbuwhlp4+2lxb3DlCj8EnmBnCmpZ1oIbDrckj8A0WKXmDS+c0mZ/rcRrSpiERHiahn8WcnjANqJSjUORIvJNP2gncLbLdzvIUH8cw9ItJDqTLfIadLaFvZxWKiWap5nxwDfoxdnU8uDi8btxdKRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB3868.namprd11.prod.outlook.com (2603:10b6:5:19f::13) by DM6PR11MB3225.namprd11.prod.outlook.com (2603:10b6:5:5b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13; Wed, 8 Jun 2022 04:26:43 +0000 Received: from DM6PR11MB3868.namprd11.prod.outlook.com ([fe80::3d91:62dc:c665:9083]) by DM6PR11MB3868.namprd11.prod.outlook.com ([fe80::3d91:62dc:c665:9083%6]) with mapi id 15.20.5314.019; Wed, 8 Jun 2022 04:26:43 +0000 From: "Naga Harish K, S V" To: "Kundapura, Ganapati" , "jerinjacobk@gmail.com" , "dev@dpdk.org" , "Jayatheerthan, Jay" Subject: RE: [PATCH v4] eventdev: add adapter instance get API Thread-Topic: [PATCH v4] eventdev: add adapter instance get API Thread-Index: AQHYeoJQnmxEha4q/k+fPF6G/0wdq61E4/VA Date: Wed, 8 Jun 2022 04:26:43 +0000 Message-ID: References: <20220607082115.3459593-1-ganapati.kundapura@intel.com> <20220607151320.3561528-1-ganapati.kundapura@intel.com> In-Reply-To: <20220607151320.3561528-1-ganapati.kundapura@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6ac6b98d-56df-4e7d-c475-08da4907178f x-ms-traffictypediagnostic: DM6PR11MB3225:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5zmUbJT0m/8yuVQlJT38bs3/C/ZzL+iA8HhhJKHTZ/bImPvHa7z2c+vXfB10w5gqpu9RUrq0spluxaMOJCGIPSlq3cn+wSou3rHodLyYuoUR+h6oz0pkFrUhVMCDiuyM9elhfDq3frl+JiIgKREyzJiC2VkkRoldkhY65+P3yEj/H5uUmmeAH7vIHiuIZ/RFsZzHM7zt5Hu+UUJIg5fkznzzmMRqRSQaqVriP4Rwte0uW47WcV4mkqpOiC0Cr2UbOKp9tQm+e2Sjfzz840ZkQjXx6lYYY9MkUUTaIeXVPmGuqelv4dVdYZ6faKYU5rw0v4l61KtJWCFv1tYQMz8iWkxb+YEZ2S4yUPNHslwiK1XN5o2XEL1deFvw9DeWD7Y8Z2vMxApnSFQoLpoNPHuk/e8VUpAupqe62qGMY4jdi7c5v7iCS5WiUirb3j99OZ2sNWJMnkYbahe5Rx6ueaOIW5c98/raW30Th2EsO7ywnKB/bXdj3d4/5Ydw90Bf9vWFAD57zBSSEHa5oCjHo3bpJG9cztysl4fm+oGxhen0UAAtyKYCaR2syr+GtI2GB7jMzMJcaO/jShPXl4Y5I73hLn2wXgtFBMzh5WCfaGoocH6SVTuUAdtJuhhLu3LRvqPT/GwWh0ZHfpTAUZDpA+vyAxo7RtQ7r+Gx0mMMIj+GaYoCSJlpC5JtH1V/+4P1U3TZlZ0j4fYLA46Q96sRDK8qsg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB3868.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(508600001)(52536014)(66556008)(66446008)(55016003)(8936002)(186003)(2906002)(5660300002)(316002)(26005)(30864003)(38070700005)(122000001)(83380400001)(82960400001)(6636002)(110136005)(9686003)(38100700002)(8676002)(33656002)(66476007)(66946007)(64756008)(53546011)(6506007)(7696005)(86362001)(76116006)(71200400001)(55236004)(579004)(559001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?j2XMcoqTj3See3QAtyyluVtR4WBuQf2NNrcuU0Vj+cC1qBL/gpooHg6PWJle?= =?us-ascii?Q?ABkDnM6e4m/C0FTubnPvFsBWp7we1krSqOf6EeWEWRPHCT+XRCJFRj59JAvf?= =?us-ascii?Q?gsfgwtoyF4mVKpEJP0hLcKgcGDpkZdZM/r14wEf7/tKU4jl2uKtB1QikEuh1?= =?us-ascii?Q?JxfHqBmQTDxi/e4SDRMAnh9MPRN+v03wOZmBk4UgPXVBg+dW9bSqncvpCnd5?= =?us-ascii?Q?LQS+7p7yd/xKSur4lHT6I6CTcSnCSQliOQ496U9OXCt7z1aurb7RKGtR0hmm?= =?us-ascii?Q?qCVqgAPY6VFc0FaAXWdG1tI4okpodAf3w5TMSGZ5QRoRk0z2lSVwFt7AkbuF?= =?us-ascii?Q?IbtVgrlivxu0IprJ6u7GFvyH3qU5cpUMPdMY0ynUD57pg3KV04d7xzDXkcNU?= =?us-ascii?Q?7ymNH6wPPkTx9O7A9jE0w/UwsGjju+PoiqEmBdOHT7UYz5SBWEvGpiRfXYZ0?= =?us-ascii?Q?H4+6iuTEqO+fDJLbpWNLfglqKqnvVGaloUsAIjm6DlEa7orkEBNkAv3NhU3P?= =?us-ascii?Q?xCBU+IFftm3VlKg54HPDjnoqVdHuzXawzlUsoXVlg1ob7zS4d6HfONQMfpIU?= =?us-ascii?Q?Ah/WYPiq4nBJfwYu7hzmoIww5nuD9E2jYIxfeMd+D3WHc+ztJyQz6P3Xz6Si?= =?us-ascii?Q?r66ZlEVJ/AEj+c7BWLR81juJspHiMjz40stlfAfscUup4xZV1eLAVcYNFIYT?= =?us-ascii?Q?5xavcMOBSbnpbLuuYBSXcPr4+QFREVeAEvnDWcBE2ZenWzbxCZV4kRPQ2oAC?= =?us-ascii?Q?kwXSU7PtXt+kU0ilWa3T30Smj3NVvsHT9ETcL1DvkbjGxOk7xBALJDwybQyq?= =?us-ascii?Q?G/ymbkFRqWNgMVAqzbO9ninztoqGgwSWMUVPQuZ1Q/JJ+zUXZLNmy1lsbzl0?= =?us-ascii?Q?Wm2XsPHg/X6yl6eLdwsIOnPJJ63dLmY925btvnK4ZW5uFhDxNQRnLl9iQ1nI?= =?us-ascii?Q?cj5R/VUkRImZGduWoyJ9DPr11z98oo30f98vM399afiTWOCTKS0YVQu7VV92?= =?us-ascii?Q?tGjxpYk2yHVIeIvHQam+YA8z7OxultjQvuJtR8bOne4DxXB+lRvnsP/z/K53?= =?us-ascii?Q?0ZX9LHeLWJv/j5nUb7rNTAaITcR2fwasmlM84hwmbHHQb7x5l893fCBVetcA?= =?us-ascii?Q?+KpZeuULJIOoWXoesbzf88GK90HDNSXyqgpE9JK/1HMby0qmNlfyBRQCVMJT?= =?us-ascii?Q?betZNOHEo8xlaB5mbnNxMv8qAo8jJtMugZpZGU1D2eneuNbABr1iFZGt6U6F?= =?us-ascii?Q?4Avhq0+z37fEb9WFjwm3JWsti4q/ms6F8Z0Vds39EdYbt5RDo5XwP1RzZ4Ya?= =?us-ascii?Q?s93WHY2osJUYQH8UYrsWOEKzMlKn2weA7XsrYFUbeIzJ8zkhLotP6ABuFvIi?= =?us-ascii?Q?YaGzTs+DS609PrVdFZvJCJNYpgnB2RNZGmrwsDhljYGPkwQYoUWEKIf2PUBG?= =?us-ascii?Q?Db9x4l154in8aGT2CpABCaviB32iAOIZ8tSnLa8V+DMrV0E9yYgQ8XfFXyy7?= =?us-ascii?Q?gys/XGejd9h1L6o0qzmz5YdQ8F5SDUC5Yo5rqEs76tHTdUuHw85jv2F46gV7?= =?us-ascii?Q?tbpe0SOInyBeIUy6Gl/yzkeZi8aVih8UWulpvm4DMVFyWKhqNYnshbCGDmbu?= =?us-ascii?Q?Td4xVzjLCeleWQrjsWDzB0T1Pyll8DszTKzd4XBuHnqOb02tV9oe6m54uEmG?= =?us-ascii?Q?1+Nk8tUmQfC1oT9dxfnuHkslzEnTcY0N2Ra5vFXrUMF79AJStlRsS4KjnhRd?= =?us-ascii?Q?jbRhGNeh8InwatfEw3SglGmZAnSurP8=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3868.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ac6b98d-56df-4e7d-c475-08da4907178f X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jun 2022 04:26:43.4930 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: K9IvsioY27getluxEWs/+4zspVc+/8itYiVNyZiHZwa63Pzhqnlfh7omhmRAJUl7WFPldWaCQdVpqkrMVAny9eIqve3ArSI6pFcTGo32vrQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3225 X-OriginatorOrg: intel.com 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 Hi Ganapati, Some comments inline. > -----Original Message----- > From: Ganapati Kundapura > Sent: Tuesday, June 7, 2022 8:43 PM > To: jerinjacobk@gmail.com; dev@dpdk.org; Jayatheerthan, Jay > > Subject: [PATCH v4] eventdev: add adapter instance get API >=20 > Added rte_event_eth_rx_adapter_instance_get() and > rte_event_eth_tx_adapter_instance_get() api's to get the adapter instance > id for a specified event port and queue index. It is supposed to be ethernet device id, not event port >=20 > Signed-off-by: Ganapati Kundapura > --- > v4: > * Moved instance array allocation and instance id storage > before adapter's nb_queue updation for handling the > error case properly >=20 > v3: > * Fixed checkpatch error >=20 > v2: > * Fixed build issues > * Added telemetry support for rte_event_eth_rx_adapter_instance_get > * arranged functions in alphabetical order in version.map >=20 > diff --git a/app/test/test_event_eth_rx_adapter.c > b/app/test/test_event_eth_rx_adapter.c > index e358a70..878004b 100644 > --- a/app/test/test_event_eth_rx_adapter.c > +++ b/app/test/test_event_eth_rx_adapter.c > @@ -39,6 +39,7 @@ test_event_eth_rx_intr_adapter_common(void) > #define TEST_INST_ID 0 > #define TEST_DEV_ID 0 > #define TEST_ETHDEV_ID 0 > +#define TEST_ETH_QUEUE_ID 0 >=20 > struct event_eth_rx_adapter_test_params { > struct rte_mempool *mp; > @@ -1001,6 +1002,87 @@ adapter_queue_conf(void) > return TEST_SUCCESS; > } >=20 > +static int > +adapter_instance_get(void) > +{ > + int err; > + uint8_t inst_id; > + uint16_t eth_dev_id; > + struct rte_eth_dev_info dev_info; > + struct rte_event_eth_rx_adapter_queue_conf queue_conf =3D {0}; > + > + /* Case 1: Test without configuring eth */ > + err =3D rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 2: Test with wrong eth port */ > + eth_dev_id =3D rte_eth_dev_count_total() + 1; > + err =3D rte_event_eth_rx_adapter_instance_get(eth_dev_id, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 3: Test with wrong rx queue */ > + err =3D rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID, > + dev_info.max_rx_queues + > 1, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 4: Test with right instance, port & rxq */ > + /* Add queue to Rx adapter */ > + queue_conf.ev.queue_id =3D TEST_ETH_QUEUE_ID; > + queue_conf.ev.sched_type =3D RTE_SCHED_TYPE_ATOMIC; > + queue_conf.ev.priority =3D RTE_EVENT_DEV_PRIORITY_NORMAL; > + > + err =3D rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID, > + &queue_conf); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + /* Add another queue */ > + queue_conf.ev.queue_id =3D TEST_ETH_QUEUE_ID + 1; > + err =3D rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1, > + &queue_conf); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1, > + &inst_id); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + /* Case 5: Test with right instance, port & wrong rxq */ > + err =3D rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 2, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Delete queues from the Rx adapter */ > + err =3D rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + return TEST_SUCCESS; > +} > + > static struct unit_test_suite event_eth_rx_tests =3D { > .suite_name =3D "rx event eth adapter test suite", > .setup =3D testsuite_setup, > @@ -1019,6 +1101,8 @@ static struct unit_test_suite event_eth_rx_tests = =3D { > adapter_queue_event_buf_test), > TEST_CASE_ST(adapter_create_with_params, adapter_free, > adapter_queue_stats_test), > + TEST_CASE_ST(adapter_create, adapter_free, > + adapter_instance_get), > TEST_CASES_END() /**< NULL terminate unit test array */ > } > }; > diff --git a/app/test/test_event_eth_tx_adapter.c > b/app/test/test_event_eth_tx_adapter.c > index 2900532..ebbc622 100644 > --- a/app/test/test_event_eth_tx_adapter.c > +++ b/app/test/test_event_eth_tx_adapter.c > @@ -29,6 +29,7 @@ test_event_eth_tx_adapter_common(void) > #define MAX_NUM_QUEUE RTE_PMD_RING_MAX_RX_RINGS > #define TEST_INST_ID 0 > #define TEST_DEV_ID 0 > +#define TEST_ETH_QUEUE_ID 0 > #define SOCKET0 0 > #define RING_SIZE 256 > #define ETH_NAME_LEN 32 > @@ -639,6 +640,79 @@ tx_adapter_service(void) } >=20 > static int > +tx_adapter_instance_get(void) > +{ > + int err; > + uint8_t inst_id; > + uint16_t eth_dev_id; > + struct rte_eth_dev_info dev_info; > + > + /* Case 1: Test without configuring eth */ > + err =3D rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 2: Test with wrong eth port */ > + eth_dev_id =3D rte_eth_dev_count_total() + 1; > + err =3D rte_event_eth_tx_adapter_instance_get(eth_dev_id, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 3: Test with wrong tx queue */ > + err =3D rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID, > + dev_info.max_tx_queues + > 1, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Case 4: Test with right instance, port & rxq */ > + /* Add queue to tx adapter */ > + err =3D rte_event_eth_tx_adapter_queue_add(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID, > + &inst_id); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + /* Add another queue to tx adapter */ > + err =3D rte_event_eth_tx_adapter_queue_add(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1, > + &inst_id); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + /* Case 5: Test with right instance, port & wrong rxq */ > + err =3D rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 2, > + &inst_id); > + TEST_ASSERT(err =3D=3D -EINVAL, "Expected -EINVAL got %d", err); > + > + /* Delete queues from the Tx adapter */ > + err =3D rte_event_eth_tx_adapter_queue_del(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + err =3D rte_event_eth_tx_adapter_queue_del(TEST_INST_ID, > + TEST_ETHDEV_ID, > + TEST_ETH_QUEUE_ID + 1); > + TEST_ASSERT(err =3D=3D 0, "Expected 0 got %d", err); > + > + return TEST_SUCCESS; > +} > + > +static int > tx_adapter_dynamic_device(void) > { > uint16_t port_id =3D rte_eth_dev_count_avail(); @@ -695,6 +769,8 > @@ static struct unit_test_suite event_eth_tx_tests =3D { > tx_adapter_start_stop), > TEST_CASE_ST(tx_adapter_create, tx_adapter_free, > tx_adapter_service), > + TEST_CASE_ST(tx_adapter_create, tx_adapter_free, > + tx_adapter_instance_get), > TEST_CASE_ST(NULL, NULL, tx_adapter_dynamic_device), > TEST_CASES_END() /**< NULL terminate unit test array */ > } > diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst > b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst > index 3b4ef50..a6d8987 100644 > --- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst > +++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst > @@ -177,6 +177,12 @@ used otherwise it returns -EINVAL. > The ``rte_event_eth_rx_adapter_queue_stats_reset`` function can be used > to reset queue level stats when queue level event buffer is in use. >=20 > +Getting Adapter instance id > +~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +The ``rte_event_eth_rx_adapter_instance_get()`` function reports rx > +adapter instance id for a specified event port and rx queue index. Same as above. Event port -> ethernet device id > + > Interrupt Based Rx Queues > ~~~~~~~~~~~~~~~~~~~~~~~~~~ >=20 > diff --git a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst > b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst > index f80d226..b14131d 100644 > --- a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst > +++ b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst > @@ -165,6 +165,12 @@ in struct ``rte_event_eth_tx_adapter_stats``. The > counter values are the sum of the counts from the eventdev PMD callback = if > the callback is supported, and the counts maintained by the service func= tion, > if one exists. >=20 > +Getting Adapter instance id > +~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +The ``rte_event_eth_tx_adapter_instanceget()`` function reports tx > +adapter instance id for a specified event port and tx queue index. > + > Tx event vectorization > ~~~~~~~~~~~~~~~~~~~~~~ >=20 > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c > b/lib/eventdev/rte_event_eth_rx_adapter.c > index bf8741d..3095647 100644 > --- a/lib/eventdev/rte_event_eth_rx_adapter.c > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c > @@ -6,6 +6,7 @@ > #include > #endif > #include > +#include >=20 > #include > #include > @@ -42,7 +43,10 @@ > /* Sentinel value to detect initialized file handle */ > #define INIT_FD -1 >=20 > -#define RXA_ADAPTER_ARRAY "rte_event_eth_rx_adapter_array" > +#define RX_ADAPTER_DATA_ARRAY "rx_adapter_data_array" > +#define RX_ADAPTER_INSTANCE_ARRAY "rx_adapter_instance_array" > + > +#define INVALID_INSTANCE_ID UINT8_MAX >=20 > /* > * Used to store port and queue ID of interrupting Rx queue @@ -251,7 > +255,12 @@ struct eth_rx_queue_info { > struct rte_event_eth_rx_adapter_stats *stats; }; >=20 > +struct event_eth_rxa_inst_info { > + uint8_t rxa_inst_id; > +}; > + > static struct event_eth_rx_adapter **event_eth_rx_adapter; > +static struct event_eth_rxa_inst_info **event_eth_rxa_inst_info; >=20 > /* Enable dynamic timestamp field in mbuf */ static uint64_t > event_eth_rx_timestamp_dynflag; @@ -1415,15 +1424,13 @@ > rxa_service_func(void *args) > return 0; > } >=20 > -static int > -rte_event_eth_rx_adapter_init(void) > +static void * > +rxa_memzone_array_get(const char *name, unsigned int elt_size, int > +nb_elems) > { > - const char *name =3D RXA_ADAPTER_ARRAY; > const struct rte_memzone *mz; > unsigned int sz; >=20 > - sz =3D sizeof(*event_eth_rx_adapter) * > - RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; > + sz =3D elt_size * nb_elems; > sz =3D RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE); >=20 > mz =3D rte_memzone_lookup(name); > @@ -1431,13 +1438,46 @@ rte_event_eth_rx_adapter_init(void) > mz =3D rte_memzone_reserve_aligned(name, sz, > rte_socket_id(), 0, > RTE_CACHE_LINE_SIZE); > if (mz =3D=3D NULL) { > - RTE_EDEV_LOG_ERR("failed to reserve memzone err > =3D %" > - PRId32, rte_errno); > - return -rte_errno; > + RTE_EDEV_LOG_ERR("failed to reserve memzone" > + " name =3D %s, err =3D %" > + PRId32, name, rte_errno); > + return NULL; > } > } >=20 > - event_eth_rx_adapter =3D mz->addr; > + return mz->addr; > +} > + > +static int > +rte_event_eth_rx_adapter_init(void) > +{ > + uint8_t i; > + > + if (event_eth_rx_adapter =3D=3D NULL) { > + event_eth_rx_adapter =3D > + > rxa_memzone_array_get(RX_ADAPTER_DATA_ARRAY, > + sizeof(*event_eth_rx_adapter), > + > RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE); > + if (event_eth_rx_adapter =3D=3D NULL) > + return -ENOMEM; > + > + for (i =3D 0; i < > RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; i++) > + event_eth_rx_adapter[i] =3D NULL; > + > + } > + > + if (event_eth_rxa_inst_info =3D=3D NULL) { > + event_eth_rxa_inst_info =3D > + > rxa_memzone_array_get(RX_ADAPTER_INSTANCE_ARRAY, > + sizeof(*event_eth_rxa_inst_info), > + RTE_MAX_ETHPORTS); > + if (event_eth_rxa_inst_info =3D=3D NULL) > + return -ENOMEM; > + > + for (i =3D 0; i < RTE_MAX_ETHPORTS; i++) > + event_eth_rxa_inst_info[i] =3D NULL; > + } > + > return 0; > } >=20 > @@ -1447,12 +1487,21 @@ rxa_memzone_lookup(void) > const struct rte_memzone *mz; >=20 > if (event_eth_rx_adapter =3D=3D NULL) { > - mz =3D rte_memzone_lookup(RXA_ADAPTER_ARRAY); > + mz =3D rte_memzone_lookup(RX_ADAPTER_DATA_ARRAY); > if (mz =3D=3D NULL) > return -ENOMEM; > + > event_eth_rx_adapter =3D mz->addr; > } >=20 > + if (event_eth_rxa_inst_info =3D=3D NULL) { > + mz =3D > rte_memzone_lookup(RX_ADAPTER_INSTANCE_ARRAY); > + if (mz =3D=3D NULL) > + return -ENOMEM; > + > + event_eth_rxa_inst_info =3D mz->addr; > + } > + > return 0; > } >=20 > @@ -1950,6 +1999,7 @@ rxa_sw_del(struct event_eth_rx_adapter > *rx_adapter, > int pollq; > int intrq; > int sintrq; > + uint16_t eth_dev_id =3D dev_info->dev->data->port_id; >=20 >=20 > if (rx_adapter->nb_queues =3D=3D 0) > @@ -1993,6 +2043,11 @@ rxa_sw_del(struct event_eth_rx_adapter > *rx_adapter, > dev_info->rx_queue[rx_queue_id].event_buf =3D NULL; > dev_info->rx_queue[rx_queue_id].stats =3D NULL; > } > + > + /* unset rxa_inst_id for rx_queue_id */ > + if (event_eth_rxa_inst_info[eth_dev_id]) > + > event_eth_rxa_inst_info[eth_dev_id][rx_queue_id].rxa_inst_id =3D > + > INVALID_INSTANCE_ID; > } >=20 > static int > @@ -2085,6 +2140,33 @@ rxa_add_queue(struct event_eth_rx_adapter > *rx_adapter, > } > } >=20 > + /* Allocate storage to store rxa_inst_id for rxq */ > + if (event_eth_rxa_inst_info[eth_dev_id] =3D=3D NULL) { > + uint16_t n, i; > + struct event_eth_rxa_inst_info *i_info; > + > + n =3D rte_eth_devices[eth_dev_id].data->nb_rx_queues; > + > + i_info =3D rte_zmalloc_socket("event_eth_rxa_inst_info", > + n * sizeof(struct event_eth_rxa_inst_info), > + 0, > + rx_adapter->socket_id); > + if (i_info =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("Failed to allocate storage for " > + "event_eth_rxa_inst_info"); > + return -ENOMEM; > + } > + > + for (i =3D 0; i < n; i++) > + i_info[i].rxa_inst_id =3D INVALID_INSTANCE_ID; > + > + event_eth_rxa_inst_info[eth_dev_id] =3D i_info; > + } > + > + /* store rxa id for rx_queue_id in event_eth_rxa_inst_info */ > + event_eth_rxa_inst_info[eth_dev_id][rx_queue_id].rxa_inst_id =3D > + rx_adapter- > >id; > + > if (!rx_adapter->use_queue_event_buf) > return 0; >=20 > @@ -2523,6 +2605,10 @@ int > rte_event_eth_rx_adapter_free(uint8_t id) { > struct event_eth_rx_adapter *rx_adapter; > + uint16_t eth_dev_id; > + > + if (rxa_memzone_lookup()) > + return -ENOMEM; >=20 > RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, - > EINVAL); >=20 > @@ -2544,6 +2630,13 @@ rte_event_eth_rx_adapter_free(uint8_t id) > rte_free(rx_adapter); > event_eth_rx_adapter[id] =3D NULL; >=20 > + for (eth_dev_id =3D 0; eth_dev_id < RTE_MAX_ETHPORTS; > eth_dev_id++) { > + if (event_eth_rxa_inst_info[eth_dev_id]) { > + rte_free(event_eth_rxa_inst_info[eth_dev_id]); > + event_eth_rxa_inst_info[eth_dev_id] =3D NULL; > + } > + } > + > rte_eventdev_trace_eth_rx_adapter_free(id); > return 0; > } > @@ -2561,6 +2654,9 @@ rte_event_eth_rx_adapter_queue_add(uint8_t id, > struct eth_device_info *dev_info; > struct rte_event_eth_rx_adapter_vector_limits limits; >=20 > + if (rxa_memzone_lookup()) > + return -ENOMEM; > + > RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, - > EINVAL); > RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); >=20 > @@ -2726,6 +2822,9 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, > uint16_t eth_dev_id, > uint32_t *rx_wrr =3D NULL; > int num_intr_vec; >=20 > + if (rxa_memzone_lookup()) > + return -ENOMEM; > + > RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, - > EINVAL); > RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); >=20 > @@ -2832,6 +2931,7 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, > uint16_t eth_dev_id, >=20 > rte_eventdev_trace_eth_rx_adapter_queue_del(id, eth_dev_id, > rx_queue_id, ret); > + > return ret; > } >=20 > @@ -3286,6 +3386,49 @@ > rte_event_eth_rx_adapter_queue_conf_get(uint8_t id, > return 0; > } >=20 > +int > +rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, > + uint16_t rx_queue_id, Indent > + uint8_t *rxa_inst_id) > +{ > + uint8_t inst_id; > + > + if (rxa_memzone_lookup()) > + return -ENOMEM; > + > + if (eth_dev_id >=3D rte_eth_dev_count_avail()) { > + RTE_EDEV_LOG_ERR("Invalid ethernet port id %u", > eth_dev_id); > + return -EINVAL; > + } > + > + if (rx_queue_id >=3D rte_eth_devices[eth_dev_id].data- > >nb_rx_queues) { > + RTE_EDEV_LOG_ERR("Invalid Rx queue %u", rx_queue_id); > + return -EINVAL; > + } > + > + if (rxa_inst_id =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("rxa_inst_id cannot be NULL"); > + return -EINVAL; > + } > + > + if (event_eth_rxa_inst_info[eth_dev_id] =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("No valid rxa instance for eth_dev_id > %u", > + eth_dev_id); > + return -EINVAL; > + } > + > + inst_id =3D > event_eth_rxa_inst_info[eth_dev_id][rx_queue_id].rxa_inst_id; > + if (inst_id =3D=3D INVALID_INSTANCE_ID) { > + RTE_EDEV_LOG_ERR("Invalid rxa instance for eth_dev_id > %u, " > + "rx_queue_id %u", eth_dev_id, > rx_queue_id); > + return -EINVAL; > + } > + > + *rxa_inst_id =3D inst_id; > + > + return 0; > +} > + > #define RXA_ADD_DICT(stats, s) rte_tel_data_add_dict_u64(d, #s, stats.s) >=20 > static int > @@ -3554,6 +3697,68 @@ handle_rxa_queue_stats_reset(const char *cmd > __rte_unused, > return ret; > } >=20 > +static int > +handle_rxa_instance_get(const char *cmd __rte_unused, > + const char *params, > + struct rte_tel_data *d) > +{ > + uint8_t instance_id; > + uint16_t rx_queue_id; > + int eth_dev_id, ret =3D -1; > + char *token, *l_params; > + > + if (params =3D=3D NULL || strlen(params) =3D=3D 0 || !isdigit(*params)) > + return -1; > + > + l_params =3D strdup(params); > + if (l_params =3D=3D NULL) > + return -ENOMEM; > + token =3D strtok(l_params, ","); > + > RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET( > token, -1); > + > + /* Get device ID from parameter string */ > + eth_dev_id =3D strtoul(token, NULL, 10); > + RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, - > EINVAL); > + > + token =3D strtok(NULL, ","); > + > RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET( > token, -1); > + > + /* Get Rx queue ID from parameter string */ > + rx_queue_id =3D strtoul(token, NULL, 10); > + if (rx_queue_id >=3D rte_eth_devices[eth_dev_id].data- > >nb_rx_queues) { > + RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", > rx_queue_id); > + ret =3D -EINVAL; > + goto error; > + } > + > + token =3D strtok(NULL, "\0"); > + if (token !=3D NULL) > + RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev" > + " telemetry command, ignoring"); > + > + /* Parsing parameter finished */ > + free(l_params); > + > + if (rte_event_eth_rx_adapter_instance_get(eth_dev_id, > + rx_queue_id, > + &instance_id)) { > + RTE_EDEV_LOG_ERR("Failed to get RX adapter instance ID " > + " for rx_queue_id =3D %d", rx_queue_id); > + return -1; > + } > + > + rte_tel_data_start_dict(d); > + rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id); > + rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id); > + rte_tel_data_add_dict_u64(d, "rxa_instance_id", instance_id); > + > + return 0; > + > +error: > + free(l_params); > + return ret; > +} > + > RTE_INIT(rxa_init_telemetry) > { > rte_telemetry_register_cmd("/eventdev/rxa_stats", > @@ -3575,4 +3780,8 @@ RTE_INIT(rxa_init_telemetry) > rte_telemetry_register_cmd("/eventdev/rxa_queue_stats_reset", > handle_rxa_queue_stats_reset, > "Reset Rx queue stats. Parameter: rxa_id, dev_id, > queue_id"); > + > + rte_telemetry_register_cmd("/eventdev/rxa_rxq_instance_get", > + handle_rxa_instance_get, > + "Returns Rx adapter instance id. Parameter: dev_id, > queue_id"); > } > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.h > b/lib/eventdev/rte_event_eth_rx_adapter.h > index 3608a7b..f56938d 100644 > --- a/lib/eventdev/rte_event_eth_rx_adapter.h > +++ b/lib/eventdev/rte_event_eth_rx_adapter.h > @@ -38,6 +38,7 @@ > * - rte_event_eth_rx_adapter_queue_stats_get() > * - rte_event_eth_rx_adapter_queue_stats_reset() > * - rte_event_eth_rx_adapter_event_port_get() > + * - rte_event_eth_rx_adapter_instance_get() > * > * The application creates an ethernet to event adapter using > * rte_event_eth_rx_adapter_create_ext() or > rte_event_eth_rx_adapter_create() @@ -704,6 +705,28 @@ > __rte_experimental int > rte_event_eth_rx_adapter_event_port_get(uint8_t id, uint8_t > *event_port_id); >=20 > +/** > + * Get RX adapter instance ID for a RX queue > + * > + * @param eth_dev_id > + * Port identifier of Ethernet device. > + * > + * @param rx_queue_id > + * Ethernet device receive queue index > + * > + * @param[out] rxa_inst_id > + * RX adapter instance identifier. It is a pointer to store RX adapter instance identifier > + * > + * @return > + * - 0: Success > + * - <0: Error code on failure > + */ > +__rte_experimental > +int > +rte_event_eth_rx_adapter_instance_get(uint16_t eth_dev_id, > + uint16_t rx_queue_id, > + uint8_t *rxa_inst_id); > + > #ifdef __cplusplus > } > #endif > diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c > b/lib/eventdev/rte_event_eth_tx_adapter.c > index 1b304f0..d9de6e5 100644 > --- a/lib/eventdev/rte_event_eth_tx_adapter.c > +++ b/lib/eventdev/rte_event_eth_tx_adapter.c > @@ -1,6 +1,8 @@ > /* SPDX-License-Identifier: BSD-3-Clause > * Copyright(c) 2018 Intel Corporation. > */ > +#include > + > #include > #include > #include > @@ -17,6 +19,11 @@ > #define TXA_MAX_NB_TX 128 > #define TXA_INVALID_DEV_ID INT32_C(-1) > #define TXA_INVALID_SERVICE_ID INT64_C(-1) > +#define INVALID_INSTANCE_ID UINT8_MAX > + > +#define TXA_ADAPTER_ARRAY "txa_adapter_array" > +#define TXA_SERVICE_DATA_ARRAY "txa_service_data_array" > +#define TXA_ADAPTER_INSTANCE_ARRAY "txa_adapter_instance_array" >=20 > #define txa_evdev(id) (&rte_eventdevs[txa_dev_id_array[(id)]]) >=20 > @@ -140,6 +147,10 @@ struct txa_service_ethdev { > void *queues; > }; >=20 > +struct event_eth_txa_inst_info { > + uint8_t txa_inst_id; > +}; > + > /* Array of adapter instances, initialized with event device id > * when adapter is created > */ > @@ -148,6 +159,9 @@ static int *txa_dev_id_array; > /* Array of pointers to service implementation data */ static struct > txa_service_data **txa_service_data_array; >=20 > +/* array of adapter instances to store tx queue specific instance */ > +static struct event_eth_txa_inst_info **event_eth_txa_inst_info; > + > static int32_t txa_service_func(void *args); static int > txa_service_adapter_create_ext(uint8_t id, > struct rte_eventdev *dev, > @@ -194,12 +208,42 @@ txa_memzone_array_get(const char *name, > unsigned int elt_size, int nb_elems) } >=20 > static int > +txa_memzone_lookup(void) > +{ > + const struct rte_memzone *mz; > + > + if (txa_dev_id_array =3D=3D NULL) { > + mz =3D rte_memzone_lookup(TXA_ADAPTER_ARRAY); > + if (mz =3D=3D NULL) > + return -ENOMEM; > + txa_dev_id_array =3D mz->addr; > + } > + > + if (txa_service_data_array =3D=3D NULL) { > + mz =3D rte_memzone_lookup(TXA_SERVICE_DATA_ARRAY); > + if (mz =3D=3D NULL) > + return -ENOMEM; > + txa_service_data_array =3D mz->addr; > + } > + > + if (event_eth_txa_inst_info =3D=3D NULL) { > + mz =3D > rte_memzone_lookup(TXA_ADAPTER_INSTANCE_ARRAY); > + if (mz =3D=3D NULL) > + return -ENOMEM; > + event_eth_txa_inst_info =3D mz->addr; > + } > + > + return 0; > +} > + > + > +static int > txa_dev_id_array_init(void) > { > if (txa_dev_id_array =3D=3D NULL) { > int i; >=20 > - txa_dev_id_array =3D > txa_memzone_array_get("txa_adapter_array", > + txa_dev_id_array =3D > txa_memzone_array_get(TXA_ADAPTER_ARRAY, > sizeof(int), >=20 > RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE); > if (txa_dev_id_array =3D=3D NULL) > @@ -221,15 +265,30 @@ txa_init(void) > static int > txa_service_data_init(void) > { > + uint8_t i; > + > if (txa_service_data_array =3D=3D NULL) { > txa_service_data_array =3D > - > txa_memzone_array_get("txa_service_data_array", > + > txa_memzone_array_get(TXA_SERVICE_DATA_ARRAY, > sizeof(int), >=20 > RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE); > if (txa_service_data_array =3D=3D NULL) > return -ENOMEM; > } >=20 > + if (event_eth_txa_inst_info =3D=3D NULL) { > + event_eth_txa_inst_info =3D > + > txa_memzone_array_get(TXA_ADAPTER_INSTANCE_ARRAY, > + sizeof(*event_eth_txa_inst_info), > + RTE_MAX_ETHPORTS); > + if (event_eth_txa_inst_info =3D=3D NULL) > + return -ENOMEM; > + } > + > + /* Reset the txa instance pointers */ > + for (i =3D 0; i < RTE_MAX_ETHPORTS; i++) > + event_eth_txa_inst_info[i] =3D NULL; > + > return 0; > } >=20 > @@ -763,6 +822,7 @@ txa_service_queue_add(uint8_t id, > struct rte_eth_dev_tx_buffer *tb; > struct txa_retry *txa_retry; > int ret =3D 0; > + uint16_t eth_dev_id =3D eth_dev->data->port_id; >=20 > txa =3D txa_service_id_to_data(id); >=20 > @@ -831,6 +891,31 @@ txa_service_queue_add(uint8_t id, > rte_eth_tx_buffer_set_err_callback(tb, > txa_service_buffer_retry, txa_retry); >=20 > + /* Allocate storage to store txa_inst_id for txq */ > + if (event_eth_txa_inst_info[eth_dev_id] =3D=3D NULL) { > + uint16_t n, i; > + struct event_eth_txa_inst_info *i_info; > + > + n =3D eth_dev->data->nb_tx_queues; > + > + i_info =3D rte_zmalloc_socket("event_eth_txa_inst_info", > + n * sizeof(event_eth_txa_inst_info), > + 0, > + txa->socket_id); > + if (i_info =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("Failed to allocate storage for " > + "event_eth_txa_inst_info"); > + goto err_unlock; > + } > + > + for (i =3D 0; i < n; i++) > + i_info[i].txa_inst_id =3D INVALID_INSTANCE_ID; > + > + event_eth_txa_inst_info[eth_dev_id] =3D i_info; > + } > + > + event_eth_txa_inst_info[eth_dev_id][tx_queue_id].txa_inst_id =3D > id; > + > tqi->tx_buf =3D tb; > tqi->added =3D 1; > tdi->nb_queues++; > @@ -902,6 +987,12 @@ txa_service_queue_del(uint8_t id, > txa->nb_queues--; > txa->txa_ethdev[port_id].nb_queues--; >=20 > + /* unset txa_inst_id for tx_queue_id */ > + if (event_eth_txa_inst_info[port_id]) > + event_eth_txa_inst_info[port_id][tx_queue_id].txa_inst_id > =3D > + > INVALID_INSTANCE_ID; > + > + > txa_service_queue_array_free(txa, port_id); > return 0; > } > @@ -1056,6 +1147,10 @@ int > rte_event_eth_tx_adapter_free(uint8_t id) { > int ret; > + uint16_t eth_dev_id; > + > + if (txa_memzone_lookup()) > + return -ENOMEM; >=20 > TXA_CHECK_OR_ERR_RET(id); >=20 > @@ -1067,6 +1162,13 @@ rte_event_eth_tx_adapter_free(uint8_t id) > ret =3D txa_service_adapter_free(id); > txa_dev_id_array[id] =3D TXA_INVALID_DEV_ID; >=20 > + for (eth_dev_id =3D 0; eth_dev_id < RTE_MAX_ETHPORTS; > eth_dev_id++) { > + if (event_eth_txa_inst_info[eth_dev_id]) { > + rte_free(event_eth_txa_inst_info[eth_dev_id]); > + event_eth_txa_inst_info[eth_dev_id] =3D NULL; > + } > + } > + > rte_eventdev_trace_eth_tx_adapter_free(id, ret); > return ret; > } > @@ -1080,6 +1182,9 @@ rte_event_eth_tx_adapter_queue_add(uint8_t id, > int ret; > uint32_t caps; >=20 > + if (txa_memzone_lookup()) > + return -ENOMEM; > + > RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); > TXA_CHECK_OR_ERR_RET(id); >=20 > @@ -1113,6 +1218,9 @@ rte_event_eth_tx_adapter_queue_del(uint8_t id, > int ret; > uint32_t caps; >=20 > + if (txa_memzone_lookup()) > + return -ENOMEM; > + > RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_dev_id, -EINVAL); > TXA_CHECK_OR_ERR_RET(id); >=20 > @@ -1218,3 +1326,46 @@ rte_event_eth_tx_adapter_stop(uint8_t id) > rte_eventdev_trace_eth_tx_adapter_stop(id, ret); > return ret; > } > + > +int > +rte_event_eth_tx_adapter_instance_get(uint16_t eth_dev_id, > + uint16_t tx_queue_id, > + uint8_t *txa_inst_id) Indent > +{ > + uint8_t inst_id; > + > + if (txa_memzone_lookup()) > + return -ENOMEM; > + > + if (eth_dev_id >=3D rte_eth_dev_count_avail()) { > + RTE_EDEV_LOG_ERR("Invalid ethernet port id %u", > eth_dev_id); > + return -EINVAL; > + } > + > + if (tx_queue_id >=3D rte_eth_devices[eth_dev_id].data- > >nb_tx_queues) { > + RTE_EDEV_LOG_ERR("Invalid tx queue id %u", tx_queue_id); > + return -EINVAL; > + } > + > + if (txa_inst_id =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("txa_instance_id cannot be NULL"); > + return -EINVAL; > + } > + > + if (event_eth_txa_inst_info[eth_dev_id] =3D=3D NULL) { > + RTE_EDEV_LOG_ERR("No valid txa instance for eth_dev_id > %d", > + eth_dev_id); > + return -EINVAL; > + } > + > + inst_id =3D > event_eth_txa_inst_info[eth_dev_id][tx_queue_id].txa_inst_id; > + if (inst_id =3D=3D INVALID_INSTANCE_ID) { > + RTE_EDEV_LOG_ERR("Invalid txa instance for eth_dev_id > %u, " > + "tx_queue_id %u", eth_dev_id, > tx_queue_id); > + return -EINVAL; > + } > + > + *txa_inst_id =3D inst_id; > + > + return 0; > +} > diff --git a/lib/eventdev/rte_event_eth_tx_adapter.h > b/lib/eventdev/rte_event_eth_tx_adapter.h > index 3908c2d..28f4fa9 100644 > --- a/lib/eventdev/rte_event_eth_tx_adapter.h > +++ b/lib/eventdev/rte_event_eth_tx_adapter.h > @@ -34,6 +34,7 @@ > * - rte_event_eth_tx_adapter_enqueue() > * - rte_event_eth_tx_adapter_event_port_get() > * - rte_event_eth_tx_adapter_service_id_get() > + * - rte_event_eth_tx_adapter_instance_get() > * > * The application creates the adapter using > * rte_event_eth_tx_adapter_create() or > rte_event_eth_tx_adapter_create_ext(). > @@ -423,6 +424,24 @@ rte_event_eth_tx_adapter_stats_reset(uint8_t id); > int rte_event_eth_tx_adapter_service_id_get(uint8_t id, uint32_t > *service_id); >=20 > +/** > + * Get TX adapter instance id for TX queue > + * > + * @param eth_dev_id > + * Port identifier of Ethernet device > + * > + * @param tx_queue_id > + * Etherdev device TX queue index > + * > + * @param[out] txa_inst_id > + * Pointer to TX adapter instance identifier */ __rte_experimental > +int rte_event_eth_tx_adapter_instance_get(uint16_t eth_dev_id, > + uint16_t tx_queue_id, > + uint8_t *txa_inst_id); Indent > + > #ifdef __cplusplus > } > #endif > diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map index > 886e2ec..1c99d52 100644 > --- a/lib/eventdev/version.map > +++ b/lib/eventdev/version.map > @@ -102,9 +102,11 @@ EXPERIMENTAL { >=20 > # added in 21.11 > rte_event_eth_rx_adapter_create_with_params; > + rte_event_eth_rx_adapter_instance_get; > rte_event_eth_rx_adapter_queue_conf_get; > rte_event_eth_rx_adapter_queue_stats_get; > rte_event_eth_rx_adapter_queue_stats_reset; > + rte_event_eth_tx_adapter_instance_get; >=20 > # added in 22.03 > rte_event_eth_rx_adapter_event_port_get; > -- > 2.6.4