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 9C47AA0C45; Wed, 6 Oct 2021 09:53:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67690410FF; Wed, 6 Oct 2021 09:53:55 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 81958410F8 for ; Wed, 6 Oct 2021 09:53:52 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10128"; a="206749223" X-IronPort-AV: E=Sophos;i="5.85,350,1624345200"; d="scan'208";a="206749223" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 00:53:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,350,1624345200"; d="scan'208";a="568059979" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga002.fm.intel.com with ESMTP; 06 Oct 2021 00:53:50 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Wed, 6 Oct 2021 00:53:50 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Wed, 6 Oct 2021 00:53:50 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) 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.2242.12; Wed, 6 Oct 2021 00:53:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uq/PXXKvqu/36K0zX4DaWlEkRcqrDL3+Fco6Jcxgp+AOn/3UH8xUsYkhLMmgxu+toywfnUvz82KS+UfH13/sgo0f1bH5N3jsQxFJq5dkgYlMpnEvsMfTg1ap5UKtktIzPpGOfZhe5GXl7VhGkTiGF+R4RWEGkxDy5c9IwHqlYSE33kMz3NqXDyKT3KscNljEBgd7wyEBp0loKV/zEX1UC5cFKYX4cJAZ5/09Xrd6SgZNueyLI1JfnewSv7rox809ETlgQRY04I7RgsR/IBDl6UG2BgYAE8HyKDKCHaybWuvvN7eSCdrnOGJW9/V5U/330JPbHtc2dxcxe64D94JQBA== 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=rrkgONQ5Q+V7ccGRNVt+CdIYxCHT0zB0KsyQ0YY/QEE=; b=g0+xsBwOWA9AprSBoVLG6eVvOqukmhvi8mE9KEUqsFDrRIszmdYKMmV8VbZH2cvbOX2TCaYbHe0Wm9kWRT2cI61wzxk1zH4NPtgY9oT/QFFM5vC81KYb2aFhTWTCzKuBo+Csqqhd5aECzPhsc6frMZpJh/x5O6Rxl9CqmtIAm6lOuUz1UtAH+rOg1sQ8Dl24pNLPA3ttYCQ5vUF0DPjSfesamdUCvD8gamsY+gVXUka9gMSI0Y4MxsKB2eHaEs+1BGBIU+GXAEWZbfM/CEY5cwJtBkgWFBj26rUOZ52iqEDv43A9cXtoarwWJ64q5OBWSNCFky0CWGeT47BiskcGDg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rrkgONQ5Q+V7ccGRNVt+CdIYxCHT0zB0KsyQ0YY/QEE=; b=MBc0sH5YPMEMNxjcZA6cTqvCFwbshlZ2CHvUWLsM/dlXZnv+fPJ2QbOHcMpagMHcqMo08rpD4M3CsxsPyVZEeaUSJMHiUdsJhTsjkUQRQjBp7dFZ9L/09VQoO8wKBMWD9f+BirCrYkiGpOVk+lJFNC+e2iUoUDSEA80iq5X6bqI= Received: from DM6PR11MB3868.namprd11.prod.outlook.com (2603:10b6:5:19f::13) by DM6PR11MB2812.namprd11.prod.outlook.com (2603:10b6:5:c4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 6 Oct 2021 07:53:48 +0000 Received: from DM6PR11MB3868.namprd11.prod.outlook.com ([fe80::89fd:9564:349a:c59e]) by DM6PR11MB3868.namprd11.prod.outlook.com ([fe80::89fd:9564:349a:c59e%4]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 07:53:48 +0000 From: "Naga Harish K, S V" To: "Jayatheerthan, Jay" , "jerinj@marvell.com" CC: "dev@dpdk.org" Thread-Topic: [PATCH v7 4/5] eventdev/rx_adapter: implement per queue event buffer Thread-Index: AQHXumcXGG1O6rYES0er8DwMau00o6vFf3RggAAYoCA= Date: Wed, 6 Oct 2021 07:53:48 +0000 Message-ID: References: <20211005143846.1058491-1-s.v.naga.harish.k@intel.com> <20211006040256.1443140-1-s.v.naga.harish.k@intel.com> <20211006040256.1443140-4-s.v.naga.harish.k@intel.com> In-Reply-To: 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.200.16 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16cb57ee-ca98-4f87-a3d0-08d9889e6e0c x-ms-traffictypediagnostic: DM6PR11MB2812: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:923; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uxjDp/X1pa4lhd72NdGyyXyAsnp/UFJlEvvopnP+jzsPCneN/sn6ZGe5tgB7vkkcMHPpZGifVa2pPPXZJd10lbf8hRSmsTcSWjcvhJFgKV5hFigJOYs7fCN/TwZF4YfP37cztGPkk0zawU/CZRM9OhnDfNMJXwtGTZH4+83AAtxXBfJLfQyjFfi9ClU39A9cH49VT0L92DshnASZ4uxTWk1NDr4nCIQXBReynRZ+D4Rzg1DcDyYWrdbr0tgkOsdgOlwBNWxR0QzYh1+VJYOfNBREv+RxvfH2ulm1Lpk3iqjxu9e8gbp6ggrMV+hkqr6JZXNdDZX5E2WGED38xsxEfCPJEmGRrOdceZEy1wWkND9ADRzz8uJCDtQ0u7CTMQR063MZcINqtqA3slAcl1xrizO2btCo4qSoGvwGjUvcTtKo3MsGrMp+/3zz+KHtrmoADkGP1MCJgZ8dgLXZbMf4k7bOk2Ujjx+obiTwlAwSlVL26lU63m8ywlrkZsq4vTuQpsPiiy4XtxM4yKNYB8dEhA+NXgG5mwhmao6nUlP3BaTL0UZOpKTyOt6Hk+CgvTGe63RYUD+eNwLM4kMFpsFE6So+BM+HYkbVlMAxyH7+OqMO4b0RroSVNwpexAPnoFmZethFMocPxLcNoBwe/BlVRwy+f9wScZn9Dc6gWY86IVl3UY52wvFuvillo1P096PEI6qFaeWPhotjY50gjzuxMw== 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:(4636009)(366004)(122000001)(186003)(53546011)(2906002)(508600001)(86362001)(66446008)(55236004)(83380400001)(64756008)(6506007)(76116006)(66556008)(71200400001)(66476007)(26005)(8936002)(38100700002)(33656002)(316002)(8676002)(55016002)(110136005)(4326008)(66946007)(52536014)(30864003)(38070700005)(7696005)(9686003)(5660300002)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ANAmIPCy+uGq2gjo4dgqfmTzktQGDZ1HDTplTLDR/4s4eetSjkqpvL491May?= =?us-ascii?Q?G/PJaAWuF7LCXQTFKxS2TwW02bMRksG6DMzHoa2SDbrXYbI3/kTr4ExPvzTm?= =?us-ascii?Q?SdyBVBUgFN3Wc1I3/+vcOVmSjm1JM1CKPgQSOUT3srWIxfL345ueayRkxFtc?= =?us-ascii?Q?4WHyKZ9PPxYq6FxaFwbN3UpdlTqQx+8KhtCBTtoqCHagHdx3IeheLaLwNqQl?= =?us-ascii?Q?tY6TIJjs8TSKf9ESoQcwx3W4j3AxC5Jmo0cGt0P9kyv8LD9vzb0Sp9Jg6Y0D?= =?us-ascii?Q?BHT8UMJUCgVYwLfe2rVVMK+nMSVUl31Y+fzHIdozbC3RU8th6PPxqWKA5pl3?= =?us-ascii?Q?i6pM7kmFonOvNpQr+gDL7nyv1PWnuE4piq0rI/9WjJ2WLP/RIjpkYt5BOaw6?= =?us-ascii?Q?M5MrMTMfYFsKw/6Xo9sG9CzXM41TQSoOpNGFkLZHUtxKeOLd9tjJpXLpQ1N1?= =?us-ascii?Q?2eKuzsw5fR/2/uNhtjC/hIFMacrzv+yRyXax8Bkix6pAc9RzNul92kFjDG7v?= =?us-ascii?Q?jfXkIex5gvRH46j6rVYdzxDcn+C6rSHxHgjxibZMAkbOJZLXeKi3jy0Wp29W?= =?us-ascii?Q?UAZR8AN9999Jl5hMWRY4WK1mHbnmSAAoRz1qGGDZ9O0wmkj8l4FeyBhvk/Ng?= =?us-ascii?Q?w42iKPfWAoHxtLI2coNcnPikNBOIaLVQz8RObqyT7G5c8iPHA4Ao7Wctum06?= =?us-ascii?Q?jnLo5ChGPV0RYIZeB21zgWsxNMiRnKpcTmvs2xk2J4Tim1s/hPD9RyRATR2B?= =?us-ascii?Q?j6P+Hi6BpCOFB2NQI0sjqlNVo9p3bv53S2tuQW1h4T9rsUeizBMRUrQ49+vQ?= =?us-ascii?Q?Jp6fL9ZLEZYpLwWRjAGRUQJgv/rjiYc/00AL1JnM5ARTdLbEjEyXAI6ZpJz8?= =?us-ascii?Q?DIRhxJpQZD+UB9V0a8dao4XCQiMyD5v67sLRiXqdyj8ePAH3tbhbpjI9388j?= =?us-ascii?Q?rERq7vTrLtH4KAB+/xviKHdTkCH/VwFWSp5kov98dMZ9zKg+NVVqXGNRK1d7?= =?us-ascii?Q?y0MqxqSGWvF8SvqATLYLsWujBOR4aUyfsGNC1/zyoyDwXhY1J3mZl804/HN4?= =?us-ascii?Q?dN1sS/zGTYRo02UpSfOnMca0agCkm3AD3zCckBDpBUDEvlUtPnpdf0GUcnL2?= =?us-ascii?Q?dNUrsh4AKMqikUZPLQqDj5dmLOflD7f9cBdvEThiAbTN0XwVU6BUcLWr/b3G?= =?us-ascii?Q?pSM5trqy1fHRxoS8RgWTCjSZzY3ky85QDWYP/FzINYpy794eGcLskQXFcqAQ?= =?us-ascii?Q?N2uIlVgHxcMDzEuJmfJrNgTw4pWIe0EsGST/ULte4nZDfAQqT8+CKNguG11V?= =?us-ascii?Q?4NV2yWbojcebbMp/gKM6I9vk?= 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: 16cb57ee-ca98-4f87-a3d0-08d9889e6e0c X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 07:53:48.0479 (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: wMgD3qrhzgORUl3oOiX1e1ZjwUZGGGWCaS/RGrI/6vcPw5ECaq0HYK3bBL+PQZE+JBfr6eGpme5dXU1qKUsVrF9V+FNE7jVtxCnaZFLrePE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2812 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v7 4/5] eventdev/rx_adapter: implement per queue event buffer 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" Hi Jay, > -----Original Message----- > From: Jayatheerthan, Jay > Sent: Wednesday, October 6, 2021 12:13 PM > To: Naga Harish K, S V ; jerinj@marvell.com > Cc: dev@dpdk.org > Subject: RE: [PATCH v7 4/5] eventdev/rx_adapter: implement per queue > event buffer >=20 > > -----Original Message----- > > From: Naga Harish K, S V > > Sent: Wednesday, October 6, 2021 9:33 AM > > To: jerinj@marvell.com; Jayatheerthan, Jay > > > > Cc: dev@dpdk.org > > Subject: [PATCH v7 4/5] eventdev/rx_adapter: implement per queue > event > > buffer > > > > this patch implement the per queue event buffer with required > > validations. > > > > Signed-off-by: Naga Harish K S V > > --- > > lib/eventdev/rte_event_eth_rx_adapter.c | 206 > > ++++++++++++++++++------ > > 1 file changed, 153 insertions(+), 53 deletions(-) > > > > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c > > b/lib/eventdev/rte_event_eth_rx_adapter.c > > index 5ccea168ea..1a2aa23475 100644 > > --- a/lib/eventdev/rte_event_eth_rx_adapter.c > > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c > > @@ -102,10 +102,12 @@ struct rte_event_eth_rx_adapter { > > uint8_t rss_key_be[RSS_KEY_SIZE]; > > /* Event device identifier */ > > uint8_t eventdev_id; > > - /* Per ethernet device structure */ > > - struct eth_device_info *eth_devices; > > /* Event port identifier */ > > uint8_t event_port_id; > > + /* Flag indicating per rxq event buffer */ > > + bool use_queue_event_buf; > > + /* Per ethernet device structure */ > > + struct eth_device_info *eth_devices; > > /* Lock to serialize config updates with service function */ > > rte_spinlock_t rx_lock; > > /* Max mbufs processed in any service function invocation */ @@ > > -241,6 +243,7 @@ struct eth_rx_queue_info { > > uint32_t flow_id_mask; /* Set to ~0 if app provides flow id > else 0 */ > > uint64_t event; > > struct eth_rx_vector_data vector_data; > > + struct rte_eth_event_enqueue_buffer *event_buf; > > }; > > > > static struct rte_event_eth_rx_adapter **event_eth_rx_adapter; @@ > > -262,6 +265,22 @@ rxa_validate_id(uint8_t id) > > return id < RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; > > } > > > > +static inline struct rte_eth_event_enqueue_buffer * > > +rxa_event_buf_get(struct rte_event_eth_rx_adapter *rx_adapter, > > + uint16_t eth_dev_id, uint16_t rx_queue_id) { > > + struct rte_eth_event_enqueue_buffer *buf =3D NULL; > > + > > + if (rx_adapter->use_queue_event_buf) { > > + struct eth_device_info *dev_info =3D > > + &rx_adapter->eth_devices[eth_dev_id]; > > + buf =3D dev_info->rx_queue[rx_queue_id].event_buf; >=20 > We can return here. It may save an instr or two. Done >=20 > > + } else > > + buf =3D &rx_adapter->event_enqueue_buffer; >=20 > Same here. Done >=20 > > + > > + return buf; > > +} > > + > > #define RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, > retval) do { \ > > if (!rxa_validate_id(id)) { \ > > RTE_EDEV_LOG_ERR("Invalid eth Rx adapter id =3D %d\n", id); \ > @@ > > -767,10 +786,9 @@ rxa_enq_block_end_ts(struct > rte_event_eth_rx_adapter > > *rx_adapter, > > > > /* Enqueue buffered events to event device */ static inline uint16_t > > -rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter) > > +rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter, > > + struct rte_eth_event_enqueue_buffer *buf) > > { > > - struct rte_eth_event_enqueue_buffer *buf =3D > > - &rx_adapter->event_enqueue_buffer; > > struct rte_event_eth_rx_adapter_stats *stats =3D &rx_adapter->stats; > > uint16_t count =3D buf->last ? buf->last - buf->head : buf->count; > > > > @@ -888,15 +906,14 @@ rxa_buffer_mbufs(struct > rte_event_eth_rx_adapter *rx_adapter, > > uint16_t eth_dev_id, > > uint16_t rx_queue_id, > > struct rte_mbuf **mbufs, > > - uint16_t num) > > + uint16_t num, > > + struct rte_eth_event_enqueue_buffer *buf) > > { > > uint32_t i; > > struct eth_device_info *dev_info =3D > > &rx_adapter- > >eth_devices[eth_dev_id]; > > struct eth_rx_queue_info *eth_rx_queue_info =3D > > &dev_info- > >rx_queue[rx_queue_id]; > > - struct rte_eth_event_enqueue_buffer *buf =3D > > - &rx_adapter- > >event_enqueue_buffer; > > uint16_t new_tail =3D buf->tail; > > uint64_t event =3D eth_rx_queue_info->event; > > uint32_t flow_id_mask =3D eth_rx_queue_info->flow_id_mask; @@ - > 995,11 > > +1012,10 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter, > > uint16_t queue_id, > > uint32_t rx_count, > > uint32_t max_rx, > > - int *rxq_empty) > > + int *rxq_empty, > > + struct rte_eth_event_enqueue_buffer *buf) > > { > > struct rte_mbuf *mbufs[BATCH_SIZE]; > > - struct rte_eth_event_enqueue_buffer *buf =3D > > - &rx_adapter- > >event_enqueue_buffer; > > struct rte_event_eth_rx_adapter_stats *stats =3D > > &rx_adapter->stats; > > uint16_t n; > > @@ -1012,7 +1028,7 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter > *rx_adapter, > > */ > > while (rxa_pkt_buf_available(buf)) { > > if (buf->count >=3D BATCH_SIZE) > > - rxa_flush_event_buffer(rx_adapter); > > + rxa_flush_event_buffer(rx_adapter, buf); > > > > stats->rx_poll_count++; > > n =3D rte_eth_rx_burst(port_id, queue_id, mbufs, > BATCH_SIZE); @@ > > -1021,14 +1037,14 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter > *rx_adapter, > > *rxq_empty =3D 1; > > break; > > } > > - rxa_buffer_mbufs(rx_adapter, port_id, queue_id, mbufs, n); > > + rxa_buffer_mbufs(rx_adapter, port_id, queue_id, mbufs, n, > buf); > > nb_rx +=3D n; > > if (rx_count + nb_rx > max_rx) > > break; > > } > > > > if (buf->count > 0) > > - rxa_flush_event_buffer(rx_adapter); > > + rxa_flush_event_buffer(rx_adapter, buf); > > > > return nb_rx; > > } > > @@ -1169,7 +1185,7 @@ rxa_intr_ring_dequeue(struct > rte_event_eth_rx_adapter *rx_adapter) > > ring_lock =3D &rx_adapter->intr_ring_lock; > > > > if (buf->count >=3D BATCH_SIZE) > > - rxa_flush_event_buffer(rx_adapter); > > + rxa_flush_event_buffer(rx_adapter, buf); > > > > while (rxa_pkt_buf_available(buf)) { > > struct eth_device_info *dev_info; > > @@ -1221,7 +1237,7 @@ rxa_intr_ring_dequeue(struct > rte_event_eth_rx_adapter *rx_adapter) > > continue; > > n =3D rxa_eth_rx(rx_adapter, port, i, nb_rx, > > rx_adapter->max_nb_rx, > > - &rxq_empty); > > + &rxq_empty, buf); > > nb_rx +=3D n; > > > > enq_buffer_full =3D !rxq_empty && n =3D=3D 0; > @@ -1242,7 +1258,7 @@ > > rxa_intr_ring_dequeue(struct rte_event_eth_rx_adapter *rx_adapter) > > } else { > > n =3D rxa_eth_rx(rx_adapter, port, queue, nb_rx, > > rx_adapter->max_nb_rx, > > - &rxq_empty); > > + &rxq_empty, buf); > > rx_adapter->qd_valid =3D !rxq_empty; > > nb_rx +=3D n; > > if (nb_rx > rx_adapter->max_nb_rx) @@ -1273,13 > +1289,12 @@ > > rxa_poll(struct rte_event_eth_rx_adapter *rx_adapter) { > > uint32_t num_queue; > > uint32_t nb_rx =3D 0; > > - struct rte_eth_event_enqueue_buffer *buf; > > + struct rte_eth_event_enqueue_buffer *buf =3D NULL; > > uint32_t wrr_pos; > > uint32_t max_nb_rx; > > > > wrr_pos =3D rx_adapter->wrr_pos; > > max_nb_rx =3D rx_adapter->max_nb_rx; > > - buf =3D &rx_adapter->event_enqueue_buffer; > > > > /* Iterate through a WRR sequence */ > > for (num_queue =3D 0; num_queue < rx_adapter->wrr_len; > num_queue++) { > > @@ -1287,24 +1302,31 @@ rxa_poll(struct rte_event_eth_rx_adapter > *rx_adapter) > > uint16_t qid =3D rx_adapter->eth_rx_poll[poll_idx].eth_rx_qid; > > uint16_t d =3D rx_adapter->eth_rx_poll[poll_idx].eth_dev_id; > > > > + buf =3D rxa_event_buf_get(rx_adapter, d, qid); > > + > > /* Don't do a batch dequeue from the rx queue if there isn't > > * enough space in the enqueue buffer. > > */ > > if (buf->count >=3D BATCH_SIZE) > > - rxa_flush_event_buffer(rx_adapter); > > + rxa_flush_event_buffer(rx_adapter, buf); > > if (!rxa_pkt_buf_available(buf)) { > > - rx_adapter->wrr_pos =3D wrr_pos; > > - return nb_rx; > > + if (rx_adapter->use_queue_event_buf) > > + goto poll_next_entry; > > + else { > > + rx_adapter->wrr_pos =3D wrr_pos; > > + return nb_rx; > > + } > > } > > > > nb_rx +=3D rxa_eth_rx(rx_adapter, d, qid, nb_rx, max_nb_rx, > > - NULL); > > + NULL, buf); > > if (nb_rx > max_nb_rx) { > > rx_adapter->wrr_pos =3D > > (wrr_pos + 1) % rx_adapter->wrr_len; > > break; > > } > > > > +poll_next_entry: > > if (++wrr_pos =3D=3D rx_adapter->wrr_len) > > wrr_pos =3D 0; > > } > > @@ -1315,12 +1337,13 @@ static void > > rxa_vector_expire(struct eth_rx_vector_data *vec, void *arg) { > > struct rte_event_eth_rx_adapter *rx_adapter =3D arg; > > - struct rte_eth_event_enqueue_buffer *buf =3D > > - &rx_adapter->event_enqueue_buffer; > > + struct rte_eth_event_enqueue_buffer *buf =3D NULL; > > struct rte_event *ev; > > > > + buf =3D rxa_event_buf_get(rx_adapter, vec->port, vec->queue); > > + > > if (buf->count) > > - rxa_flush_event_buffer(rx_adapter); > > + rxa_flush_event_buffer(rx_adapter, buf); > > > > if (vec->vector_ev->nb_elem =3D=3D 0) > > return; > > @@ -1947,9 +1970,16 @@ rxa_sw_del(struct rte_event_eth_rx_adapter > *rx_adapter, > > rx_adapter->num_rx_intr -=3D intrq; > > dev_info->nb_rx_intr -=3D intrq; > > dev_info->nb_shared_intr -=3D intrq && sintrq; > > + if (rx_adapter->use_queue_event_buf) { > > + struct rte_eth_event_enqueue_buffer *event_buf =3D > > + dev_info->rx_queue[rx_queue_id].event_buf; > > + rte_free(event_buf->events); > > + rte_free(event_buf); > > + dev_info->rx_queue[rx_queue_id].event_buf =3D NULL; > > + } > > } > > > > -static void > > +static int > > rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, > > struct eth_device_info *dev_info, > > int32_t rx_queue_id, > > @@ -1961,15 +1991,21 @@ rxa_add_queue(struct > rte_event_eth_rx_adapter *rx_adapter, > > int intrq; > > int sintrq; > > struct rte_event *qi_ev; > > + struct rte_eth_event_enqueue_buffer *new_rx_buf =3D NULL; > > + uint16_t eth_dev_id =3D dev_info->dev->data->port_id; > > + int ret; > > > > if (rx_queue_id =3D=3D -1) { > > uint16_t nb_rx_queues; > > uint16_t i; > > > > nb_rx_queues =3D dev_info->dev->data->nb_rx_queues; > > - for (i =3D 0; i < nb_rx_queues; i++) > > - rxa_add_queue(rx_adapter, dev_info, i, conf); > > - return; > > + for (i =3D 0; i < nb_rx_queues; i++) { > > + ret =3D rxa_add_queue(rx_adapter, dev_info, i, conf); > > + if (ret) > > + return ret; > > + } > > + return 0; > > } > > > > pollq =3D rxa_polled_queue(dev_info, rx_queue_id); @@ -2032,6 > +2068,37 > > @@ rxa_add_queue(struct rte_event_eth_rx_adapter *rx_adapter, > > dev_info->next_q_idx =3D 0; > > } > > } > > + > > + if (!rx_adapter->use_queue_event_buf) > > + return 0; > > + > > + new_rx_buf =3D rte_zmalloc_socket("rx_buffer_meta", > > + sizeof(*new_rx_buf), 0, > > + rte_eth_dev_socket_id(eth_dev_id)); > > + if (new_rx_buf =3D=3D NULL) { > > + RTE_EDEV_LOG_ERR("Failed to allocate event buffer meta > for " > > + "dev_id: %d queue_id: %d", > > + eth_dev_id, rx_queue_id); > > + return -ENOMEM; > > + } > > + > > + new_rx_buf->events_size =3D RTE_ALIGN(conf->event_buf_size, > BATCH_SIZE); > > + new_rx_buf->events_size +=3D (2 * BATCH_SIZE); > > + new_rx_buf->events =3D rte_zmalloc_socket("rx_buffer", > > + sizeof(struct rte_event) * > > + new_rx_buf->events_size, 0, > > + rte_eth_dev_socket_id(eth_dev_id)); > > + if (new_rx_buf->events =3D=3D NULL) { > > + rte_free(new_rx_buf); > > + RTE_EDEV_LOG_ERR("Failed to allocate event buffer for " > > + "dev_id: %d queue_id: %d", > > + eth_dev_id, rx_queue_id); > > + return -ENOMEM; > > + } > > + > > + queue_info->event_buf =3D new_rx_buf; > > + > > + return 0; > > } > > > > static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter, @@ > > -2060,6 +2127,16 @@ static int rxa_sw_add(struct > rte_event_eth_rx_adapter *rx_adapter, > > temp_conf.servicing_weight =3D 1; > > } > > queue_conf =3D &temp_conf; > > + > > + if (queue_conf->servicing_weight =3D=3D 0 && > > + rx_adapter->use_queue_event_buf) { > > + > > + RTE_EDEV_LOG_ERR("Use of queue level event > buffer " > > + "not supported for interrupt queues > " > > + "dev_id: %d queue_id: %d", > > + eth_dev_id, rx_queue_id); > > + return -EINVAL; > > + } > > } > > > > nb_rx_queues =3D dev_info->dev->data->nb_rx_queues; > > @@ -2139,7 +2216,9 @@ static int rxa_sw_add(struct > > rte_event_eth_rx_adapter *rx_adapter, > > > > > > > > - rxa_add_queue(rx_adapter, dev_info, rx_queue_id, queue_conf); > > + ret =3D rxa_add_queue(rx_adapter, dev_info, rx_queue_id, > queue_conf); > > + if (ret) > > + goto err_free_rxqueue; > > rxa_calc_wrr_sequence(rx_adapter, rx_poll, rx_wrr); > > > > rte_free(rx_adapter->eth_rx_poll); > > @@ -2160,7 +2239,7 @@ static int rxa_sw_add(struct > rte_event_eth_rx_adapter *rx_adapter, > > rte_free(rx_poll); > > rte_free(rx_wrr); > > > > - return 0; > > + return ret; > > } > > > > static int > > @@ -2286,20 +2365,25 @@ rxa_create(uint8_t id, uint8_t dev_id, > > rx_adapter->eth_devices[i].dev =3D &rte_eth_devices[i]; > > > > /* Rx adapter event buffer allocation */ > > - buf =3D &rx_adapter->event_enqueue_buffer; > > - buf->events_size =3D rxa_params->event_buf_size; > > - > > - events =3D rte_zmalloc_socket(rx_adapter->mem_name, > > - buf->events_size * sizeof(*events), > > - 0, socket_id); > > - if (events =3D=3D NULL) { > > - RTE_EDEV_LOG_ERR("Failed to allocate mem for event > buffer\n"); > > - rte_free(rx_adapter->eth_devices); > > - rte_free(rx_adapter); > > - return -ENOMEM; > > - } > > + rx_adapter->use_queue_event_buf =3D rxa_params- > >use_queue_event_buf; > > + > > + if (!rx_adapter->use_queue_event_buf) { > > + buf =3D &rx_adapter->event_enqueue_buffer; > > + buf->events_size =3D rxa_params->event_buf_size; > > + > > + events =3D rte_zmalloc_socket(rx_adapter->mem_name, > > + buf->events_size * > sizeof(*events), > > + 0, socket_id); > > + if (events =3D=3D NULL) { > > + RTE_EDEV_LOG_ERR("Failed to allocate memory " > > + "for adapter event buffer"); > > + rte_free(rx_adapter->eth_devices); > > + rte_free(rx_adapter); > > + return -ENOMEM; > > + } > > > > - rx_adapter->event_enqueue_buffer.events =3D events; > > + rx_adapter->event_enqueue_buffer.events =3D events; > > + } > > > > event_eth_rx_adapter[id] =3D rx_adapter; > > > > @@ -2327,6 +2411,7 @@ rte_event_eth_rx_adapter_create_ext(uint8_t > id, > > uint8_t dev_id, > > > > /* use default values for adapter params */ > > rxa_params.event_buf_size =3D ETH_EVENT_BUFFER_SIZE; > > + rxa_params.use_queue_event_buf =3D false; > > > > return rxa_create(id, dev_id, &rxa_params, conf_cb, conf_arg); } > @@ > > -2346,11 +2431,15 @@ > rte_event_eth_rx_adapter_create_with_params(uint8_t id, uint8_t dev_id, > > /* use default values if rxa_params is NULL */ > > if (rxa_params =3D=3D NULL) { > > rxa_params =3D &temp_params; > > - rxa_params->event_buf_size =3D ETH_EVENT_BUFFER_SIZE; > > - } > > - > > - if (rxa_params->event_buf_size =3D=3D 0) > > + rxa_params->event_buf_size =3D 4 * BATCH_SIZE; >=20 > This assumes ETH_EVENT_BUFFER_SIZE to be set to 6 * BATCH_SIZE so we > can have 4x here and 2x later. It may break if ETH_EVENT_BUFFER_SIZE is > changed later. > Can we change the code to just use ETH_EVENT_BUFFER_SIZE here. See > below. >=20 Updated in V8 patch set > > + rxa_params->use_queue_event_buf =3D false; > > + } else if ((!rxa_params->use_queue_event_buf && > > + rxa_params->event_buf_size =3D=3D 0) || > > + (rxa_params->use_queue_event_buf && > > + rxa_params->event_buf_size !=3D 0)) { > > + RTE_EDEV_LOG_ERR("Invalid adapter params\n"); > > return -EINVAL; > > + } > > > > pc =3D rte_malloc(NULL, sizeof(*pc), 0); > > if (pc =3D=3D NULL) > > @@ -2362,9 +2451,11 @@ > rte_event_eth_rx_adapter_create_with_params(uint8_t id, uint8_t dev_id, > > * from NIC rx queues to get full buffer utilization and prevent > > * unnecessary rollovers. > > */ > > - rxa_params->event_buf_size =3D RTE_ALIGN(rxa_params- > >event_buf_size, > > - BATCH_SIZE); > > - rxa_params->event_buf_size +=3D (BATCH_SIZE + BATCH_SIZE); > > + if (!rxa_params->use_queue_event_buf) { > > + rxa_params->event_buf_size =3D > > + RTE_ALIGN(rxa_params->event_buf_size, > BATCH_SIZE); > > + rxa_params->event_buf_size +=3D (BATCH_SIZE + > BATCH_SIZE); > > + } >=20 > Above if condition can be added as an else part of rxa_params =3D=3D NULL= . > Something like: >=20 > if (rxa_params =3D=3D NULL) { > rxa_params =3D &temp_params; > rxa_params->event_buf_size =3D ETH_EVENT_BUFFER_SIZE; > rxa_params->use_queue_event_buf =3D false; > } else if ((!rxa_params->use_queue_event_buf && > rxa_params->event_buf_size =3D=3D 0) || > (rxa_params->use_queue_event_buf && > rxa_params->event_buf_size !=3D 0)) { > RTE_EDEV_LOG_ERR("Invalid adapter params\n"); > return -EINVAL; > } else if (!rxa_params->use_queue_event_buf) { > rxa_params->event_buf_size =3D > RTE_ALIGN(rxa_params->event_buf_size, > BATCH_SIZE); > rxa_params->event_buf_size +=3D (BATCH_SIZE + > BATCH_SIZE); > } >=20 Done in V8 patch set > > > > ret =3D rxa_create(id, dev_id, rxa_params, rxa_default_conf_cb, pc); > > if (ret) > > @@ -2418,7 +2509,8 @@ rte_event_eth_rx_adapter_free(uint8_t id) > > if (rx_adapter->default_cb_arg) > > rte_free(rx_adapter->conf_arg); > > rte_free(rx_adapter->eth_devices); > > - rte_free(rx_adapter->event_enqueue_buffer.events); > > + if (!rx_adapter->use_queue_event_buf) > > + rte_free(rx_adapter->event_enqueue_buffer.events); > > rte_free(rx_adapter); > > event_eth_rx_adapter[id] =3D NULL; > > > > @@ -2522,6 +2614,14 @@ rte_event_eth_rx_adapter_queue_add(uint8_t > id, > > return -EINVAL; > > } > > > > + if ((rx_adapter->use_queue_event_buf && > > + queue_conf->event_buf_size =3D=3D 0) || > > + (!rx_adapter->use_queue_event_buf && > > + queue_conf->event_buf_size !=3D 0)) { > > + RTE_EDEV_LOG_ERR("Invalid Event buffer size for the > queue"); > > + return -EINVAL; > > + } > > + > > dev_info =3D &rx_adapter->eth_devices[eth_dev_id]; > > > > if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT) { > > -- > > 2.25.1