From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31DFAA04B6; Mon, 12 Oct 2020 21:06:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4A761D988; Mon, 12 Oct 2020 21:06:29 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 7FEED1BC17 for ; Mon, 12 Oct 2020 21:06:26 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09CJ4uaL011715; Mon, 12 Oct 2020 12:06:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=gIBX2Zv+7RQ4W+zqh0Jmx2yQIF3kgE8Znif1hCa2R5s=; b=EfWdbKl6SMgl9dv7+G5nYZnmpSMHtK3/wssgYlVPgGtIvCfYeaBrGR5bTCxtjyNQyyvo hmW4mArzrscrpRR9fNj3EWE3Hm6jpgOVaSS3/85q7NwEO9VMCx14arzRpCnA6CpfpxDy HeIRrFgMuk9bTVAN56sQ+vCXZR42l3th0BKi1NMfhHCWJyijn05S882LL+7HmIml0iE5 +xSA6v3ajF/jUsy+Z9sut5ogw0JyUCoEuidqIEkMLx/R0Qo+XQVjz1CLy+YpH4zEctxd toejfKxqC3i21jzPk0BsVs4il+5a4WAKh94EwFkor42BdQWvGlVebIsjwtomAVq6QDnb iQ== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 343aanff7v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 12 Oct 2020 12:06:22 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Oct 2020 12:06:21 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Oct 2020 12:06:20 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.106) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Mon, 12 Oct 2020 12:06:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CYbkOz53CLLNFqagTV0NGER+p/91SV8L/AipRckLq3+Nd/RdiKgjqp1U4u/nfMQvxtBr68dA9U7d6pnksOJhapya/+TVwJKz5Yhp7JnkC4ZwGIoS72GLQSVxiJRNnwd3Y7VoDDlpTwE8sJHi72O+S0wKthh+GSgzAEBzSADpAR6+f4PYK5as9hqrCopdnbAlFfMVtx9Y85IoAe2wn6YJZg2DkHJjdK4BqhU+zLh+pfm9C7Qh9SIhbEDZZUBfVgnObFE/6KqfB9DeQznG/F/dcvJELxxnHJfDenrvM8q6mLzWygCMzqr7vrtYdDXQ+mXU+WfCSnnJfBaCqG88C98NFQ== 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-SenderADCheck; bh=gIBX2Zv+7RQ4W+zqh0Jmx2yQIF3kgE8Znif1hCa2R5s=; b=c4NqDGm9kKVVIMl7lng7jIjs9+E4QdMab6rXbTzPZYYTeQdzUnD3RlOr/1d11rsxkgMlQiYu7v2qkPhRlRlnYs3Cb9wcu7V3ZqUauE2aGdUsNnZIQDnP+Qa4/K0EcGHACPze/5Cid2KdxEm+heyZuE/8+DU/W+gi6rV2m0ruC/3kDnovIaUNCLHWGXLDFjKXprjpTLGqsuWopOYcakBBJORqo3EuME3tmp5AM5ZIBoGJ0qudNmumD9ZKwCJT7kUh/mAjGW/D3HCzci0Ib2giccr95UOZxGUn6LJAPcATnbUDbYCXQg99CkMlV2GvnbH5M4kOqxt+uXAuw4o8cXRt+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gIBX2Zv+7RQ4W+zqh0Jmx2yQIF3kgE8Znif1hCa2R5s=; b=oLzTxZSJOXvOYf8NKc4brOWGapbww8b0J+BuuagoahR29v/PGFnnRe1wN8cbpFpstggrnU2Cq57/S/fGhjLqrPB8y+4w/k1jIWLd+W1o0EHrGIDUDyo4X97zMJYaTFsLWxRrm6od5aiO7uuwGUC/En98T8WM6F92PrG5Scbm4yc= Received: from BN6PR18MB1140.namprd18.prod.outlook.com (2603:10b6:404:6a::10) by BN6PR18MB1522.namprd18.prod.outlook.com (2603:10b6:404:12a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.25; Mon, 12 Oct 2020 19:06:18 +0000 Received: from BN6PR18MB1140.namprd18.prod.outlook.com ([fe80::c816:d1f8:15db:3d4]) by BN6PR18MB1140.namprd18.prod.outlook.com ([fe80::c816:d1f8:15db:3d4%10]) with mapi id 15.20.3455.030; Mon, 12 Oct 2020 19:06:18 +0000 From: Pavan Nikhilesh Bhagavatula To: Timothy McDaniel , Hemant Agrawal , Nipun Gupta , =?iso-8859-1?Q?Mattias_R=F6nnblom?= , "Jerin Jacob Kollanukkaran" , Liang Ma , Peter Mccarthy , Harry van Haaren , Nikhil Rao , Ray Kinsella , Neil Horman CC: "dev@dpdk.org" , "erik.g.carrillo@intel.com" , "gage.eads@intel.com" Thread-Topic: [EXT] [PATCH v2 1/2] eventdev: eventdev: express DLB/DLB2 PMD constraints Thread-Index: AQHWm1W8Z7RhVwXSmUiwh52SLPsft6mUW6cw Date: Mon, 12 Oct 2020 19:06:18 +0000 Message-ID: References: <1601929674-27662-1-git-send-email-timothy.mcdaniel@intel.com> <1601929674-27662-2-git-send-email-timothy.mcdaniel@intel.com> In-Reply-To: <1601929674-27662-2-git-send-email-timothy.mcdaniel@intel.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=marvell.com; x-originating-ip: [49.37.198.174] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6edd563f-3304-4c6a-f6e7-08d86ee1e66b x-ms-traffictypediagnostic: BN6PR18MB1522: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:248; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9OztYb6cHPjQS7WkG8DiJDannbUDKc9LXViADZaSnB1nOKvLkdLqS6rAAr9Sc+9CCqdT4SO2qvNsrmUULDTyuS+7nog2NrXFC0LOIN6Mi+XsiwETlTlXiDqnEXa9ltBSmC85JmVHVUKVW6E9RgmA4wzjr6EeZw1QpKOd7a7JrhCSmZW3aTAC8pOwBbdVZxIAFVtEFgToMJgpLXETtgKzKiZKrgIimbWT0OuApmDeGhmluSHBwG+veI5u0KcSZbqOhvFLlMBj8jHz/braC2RSbzcxmy0wOUmU1QNgs2aSQM92GuZGHRY3tE2EueI7Hr9LqyZkguANWUF/Xzy+7W63V/XY/sJlmuyMCvO802uDVz4TkyBn8/qhCl1acOeIKcGe x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR18MB1140.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39860400002)(366004)(346002)(376002)(136003)(8676002)(478600001)(8936002)(5660300002)(54906003)(2906002)(110136005)(83380400001)(86362001)(316002)(33656002)(30864003)(66556008)(186003)(55016002)(7696005)(66946007)(9686003)(76116006)(66446008)(66476007)(6506007)(71200400001)(26005)(52536014)(4326008)(64756008)(7416002)(921003)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: Ozc212GheyR4P8tAZ6m8qZlGyHhcwNgl3NjrK6e7GEh4G85EjaF63xDiBUz12X+WAUtjpkaQaxe/oKelEEETKanAtMgBoQqzt8teIfwnq6YR/6ZLOOVLFif6vErEGYoSfdLbDbhD+vkK2cadtzo4kmx+For3YcPkvAfXjDBpuGmBLPeq1Sj9EC/SH7tt/tSQq4wmfglNi9UvdiDuY35EyDm92JRZyaodgTKi1hzx04Jn7/t/wk4xeTVIP5OEO0KjtVFZXX0fbN6JhZFwZLjXVheL8Be/zkjyOudIBTJLr3SS6QA7g8cEHaA5edGLLDvd8Hi27FZKq16zOldepJ0Lx9MTSTSFDtnmw4Des/S9oNY5ErnNc30GVSdRa5xHPtXaXSVh8LhdHHrXpikO21Tzf5H3V9FuaknyDPdqm9Mt4hrQ9EbXDdV41Sx1xVpy+TDeTFpFm7wH9QswSOM0kYB5bZfCfidtYdIVU+Sd8jVObKovyS5G84EbfVssHABsYU1S/FL1ZdwFGpE7iHem5bkN3Ov6djr2YRoA5IfpWI777LnwP02b4SonTL6WhaXELra340injV+47+oxva5cOb+19sKMXpo3fnOvbzXWl3dpKmfLI2dsEETB+5pv230T1iYe5EOqvApDBPcoxlRcT65Dyw== Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR18MB1140.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6edd563f-3304-4c6a-f6e7-08d86ee1e66b X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Oct 2020 19:06:18.3118 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: pQHv/uIPtkgn8UseCFiskQ5wQYDDw8K42wmyz9I9y2c4cY2XZGgOR0kmUOabFVPHQVaOuN2oAZMGHNB2nmfoWzHapQMOX60wHiM3af2MDqs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR18MB1522 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-10-12_15:2020-10-12, 2020-10-12 signatures=0 Subject: Re: [dpdk-dev] [EXT] [PATCH v2 1/2] eventdev: eventdev: express DLB/DLB2 PMD constraints X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" >This commit implements the eventdev ABI changes required by >the DLB PMD. > >Signed-off-by: Timothy McDaniel For octeontx/octeontx2 Acked-by: Pavan Nikhilesh >--- > drivers/event/dpaa/dpaa_eventdev.c | 3 +- > drivers/event/dpaa2/dpaa2_eventdev.c | 5 +- > drivers/event/dsw/dsw_evdev.c | 3 +- > drivers/event/octeontx/ssovf_evdev.c | 5 +- > drivers/event/octeontx2/otx2_evdev.c | 3 +- > drivers/event/opdl/opdl_evdev.c | 3 +- > drivers/event/skeleton/skeleton_eventdev.c | 5 +- > drivers/event/sw/sw_evdev.c | 8 ++-- > drivers/event/sw/sw_evdev_selftest.c | 6 +-- > lib/librte_eventdev/rte_event_eth_tx_adapter.c | 2 +- > lib/librte_eventdev/rte_eventdev.c | 66 >+++++++++++++++++++++++--- > lib/librte_eventdev/rte_eventdev.h | 51 ++++++++++++++++---- > lib/librte_eventdev/rte_eventdev_pmd_pci.h | 1 - > lib/librte_eventdev/rte_eventdev_trace.h | 7 +-- > lib/librte_eventdev/rte_eventdev_version.map | 4 +- > 15 files changed, 134 insertions(+), 38 deletions(-) > >diff --git a/drivers/event/dpaa/dpaa_eventdev.c >b/drivers/event/dpaa/dpaa_eventdev.c >index b5ae87a..07cd079 100644 >--- a/drivers/event/dpaa/dpaa_eventdev.c >+++ b/drivers/event/dpaa/dpaa_eventdev.c >@@ -355,7 +355,8 @@ dpaa_event_dev_info_get(struct rte_eventdev >*dev, > RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED | > RTE_EVENT_DEV_CAP_BURST_MODE | > RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | >- RTE_EVENT_DEV_CAP_NONSEQ_MODE; >+ RTE_EVENT_DEV_CAP_NONSEQ_MODE | >+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; > } > > static int >diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c >b/drivers/event/dpaa2/dpaa2_eventdev.c >index 3ae4441..712db6c 100644 >--- a/drivers/event/dpaa2/dpaa2_eventdev.c >+++ b/drivers/event/dpaa2/dpaa2_eventdev.c >@@ -406,7 +406,8 @@ dpaa2_eventdev_info_get(struct rte_eventdev >*dev, > RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | > RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | > RTE_EVENT_DEV_CAP_NONSEQ_MODE | >- RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES; >+ RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES | >+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; > > } > >@@ -536,7 +537,7 @@ dpaa2_eventdev_port_def_conf(struct >rte_eventdev *dev, uint8_t port_id, > DPAA2_EVENT_MAX_PORT_DEQUEUE_DEPTH; > port_conf->enqueue_depth =3D > DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH; >- port_conf->disable_implicit_release =3D 0; >+ port_conf->event_port_cfg =3D 0; > } > > static int >diff --git a/drivers/event/dsw/dsw_evdev.c >b/drivers/event/dsw/dsw_evdev.c >index e796975..933a5a5 100644 >--- a/drivers/event/dsw/dsw_evdev.c >+++ b/drivers/event/dsw/dsw_evdev.c >@@ -224,7 +224,8 @@ dsw_info_get(struct rte_eventdev *dev >__rte_unused, > .event_dev_cap =3D >RTE_EVENT_DEV_CAP_BURST_MODE| > RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED| > RTE_EVENT_DEV_CAP_NONSEQ_MODE| >- RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT >+ RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT| >+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID > }; > } > >diff --git a/drivers/event/octeontx/ssovf_evdev.c >b/drivers/event/octeontx/ssovf_evdev.c >index 4fc4e8f..1c6bcca 100644 >--- a/drivers/event/octeontx/ssovf_evdev.c >+++ b/drivers/event/octeontx/ssovf_evdev.c >@@ -152,7 +152,8 @@ ssovf_info_get(struct rte_eventdev *dev, struct >rte_event_dev_info *dev_info) > > RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES| > > RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | > > RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | >- > RTE_EVENT_DEV_CAP_NONSEQ_MODE; >+ > RTE_EVENT_DEV_CAP_NONSEQ_MODE | >+ > RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; > > } > >@@ -218,7 +219,7 @@ ssovf_port_def_conf(struct rte_eventdev *dev, >uint8_t port_id, > port_conf->new_event_threshold =3D edev->max_num_events; > port_conf->dequeue_depth =3D 1; > port_conf->enqueue_depth =3D 1; >- port_conf->disable_implicit_release =3D 0; >+ port_conf->event_port_cfg =3D 0; > } > > static void >diff --git a/drivers/event/octeontx2/otx2_evdev.c >b/drivers/event/octeontx2/otx2_evdev.c >index b8b57c3..ae35bb5 100644 >--- a/drivers/event/octeontx2/otx2_evdev.c >+++ b/drivers/event/octeontx2/otx2_evdev.c >@@ -501,7 +501,8 @@ otx2_sso_info_get(struct rte_eventdev >*event_dev, > > RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES | > > RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | > > RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | >- > RTE_EVENT_DEV_CAP_NONSEQ_MODE; >+ > RTE_EVENT_DEV_CAP_NONSEQ_MODE | >+ > RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; > } > > static void >diff --git a/drivers/event/opdl/opdl_evdev.c >b/drivers/event/opdl/opdl_evdev.c >index 9b2f75f..3050578 100644 >--- a/drivers/event/opdl/opdl_evdev.c >+++ b/drivers/event/opdl/opdl_evdev.c >@@ -374,7 +374,8 @@ opdl_info_get(struct rte_eventdev *dev, struct >rte_event_dev_info *info) > .max_event_port_dequeue_depth =3D >MAX_OPDL_CONS_Q_DEPTH, > .max_event_port_enqueue_depth =3D >MAX_OPDL_CONS_Q_DEPTH, > .max_num_events =3D OPDL_INFLIGHT_EVENTS_TOTAL, >- .event_dev_cap =3D >RTE_EVENT_DEV_CAP_BURST_MODE, >+ .event_dev_cap =3D >RTE_EVENT_DEV_CAP_BURST_MODE | >+ >RTE_EVENT_DEV_CAP_CARRY_FLOW_ID, > }; > > *info =3D evdev_opdl_info; >diff --git a/drivers/event/skeleton/skeleton_eventdev.c >b/drivers/event/skeleton/skeleton_eventdev.c >index c889220..6fd1102 100644 >--- a/drivers/event/skeleton/skeleton_eventdev.c >+++ b/drivers/event/skeleton/skeleton_eventdev.c >@@ -101,7 +101,8 @@ skeleton_eventdev_info_get(struct >rte_eventdev *dev, > dev_info->max_num_events =3D (1ULL << 20); > dev_info->event_dev_cap =3D >RTE_EVENT_DEV_CAP_QUEUE_QOS | > > RTE_EVENT_DEV_CAP_BURST_MODE | >- > RTE_EVENT_DEV_CAP_EVENT_QOS; >+ > RTE_EVENT_DEV_CAP_EVENT_QOS | >+ > RTE_EVENT_DEV_CAP_CARRY_FLOW_ID; > } > > static int >@@ -209,7 +210,7 @@ skeleton_eventdev_port_def_conf(struct >rte_eventdev *dev, uint8_t port_id, > port_conf->new_event_threshold =3D 32 * 1024; > port_conf->dequeue_depth =3D 16; > port_conf->enqueue_depth =3D 16; >- port_conf->disable_implicit_release =3D 0; >+ port_conf->event_port_cfg =3D 0; > } > > static void >diff --git a/drivers/event/sw/sw_evdev.c >b/drivers/event/sw/sw_evdev.c >index 98dae71..058f568 100644 >--- a/drivers/event/sw/sw_evdev.c >+++ b/drivers/event/sw/sw_evdev.c >@@ -175,7 +175,8 @@ sw_port_setup(struct rte_eventdev *dev, >uint8_t port_id, > } > > p->inflight_max =3D conf->new_event_threshold; >- p->implicit_release =3D !conf->disable_implicit_release; >+ p->implicit_release =3D !(conf->event_port_cfg & >+ > RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL); > > /* check if ring exists, same as rx_worker above */ > snprintf(buf, sizeof(buf), "sw%d_p%u, %s", dev->data->dev_id, >@@ -508,7 +509,7 @@ sw_port_def_conf(struct rte_eventdev *dev, >uint8_t port_id, > port_conf->new_event_threshold =3D 1024; > port_conf->dequeue_depth =3D 16; > port_conf->enqueue_depth =3D 16; >- port_conf->disable_implicit_release =3D 0; >+ port_conf->event_port_cfg =3D 0; > } > > static int >@@ -615,7 +616,8 @@ sw_info_get(struct rte_eventdev *dev, struct >rte_event_dev_info *info) > > RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE| > > RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | > > RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | >- > RTE_EVENT_DEV_CAP_NONSEQ_MODE), >+ RTE_EVENT_DEV_CAP_NONSEQ_MODE >| >+ > RTE_EVENT_DEV_CAP_CARRY_FLOW_ID), > }; > > *info =3D evdev_sw_info; >diff --git a/drivers/event/sw/sw_evdev_selftest.c >b/drivers/event/sw/sw_evdev_selftest.c >index 38c21fa..4a7d823 100644 >--- a/drivers/event/sw/sw_evdev_selftest.c >+++ b/drivers/event/sw/sw_evdev_selftest.c >@@ -172,7 +172,6 @@ create_ports(struct test *t, int num_ports) > .new_event_threshold =3D 1024, > .dequeue_depth =3D 32, > .enqueue_depth =3D 64, >- .disable_implicit_release =3D 0, > }; > if (num_ports > MAX_PORTS) > return -1; >@@ -1227,7 +1226,6 @@ port_reconfig_credits(struct test *t) > .new_event_threshold =3D 128, > .dequeue_depth =3D 32, > .enqueue_depth =3D 64, >- .disable_implicit_release =3D 0, > }; > if (rte_event_port_setup(evdev, 0, &port_conf) < 0) { > printf("%d Error setting up port\n", __LINE__); >@@ -1317,7 +1315,6 @@ port_single_lb_reconfig(struct test *t) > .new_event_threshold =3D 128, > .dequeue_depth =3D 32, > .enqueue_depth =3D 64, >- .disable_implicit_release =3D 0, > }; > if (rte_event_port_setup(evdev, 0, &port_conf) < 0) { > printf("%d Error setting up port\n", __LINE__); >@@ -3079,7 +3076,8 @@ worker_loopback(struct test *t, uint8_t >disable_implicit_release) > * only be initialized once - and this needs to be set for multiple >runs > */ > conf.new_event_threshold =3D 512; >- conf.disable_implicit_release =3D disable_implicit_release; >+ conf.event_port_cfg =3D disable_implicit_release ? >+ RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL : 0; > > if (rte_event_port_setup(evdev, 0, &conf) < 0) { > printf("Error setting up RX port\n"); >diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c >b/lib/librte_eventdev/rte_event_eth_tx_adapter.c >index bb21dc4..8a72256 100644 >--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c >+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c >@@ -286,7 +286,7 @@ txa_service_conf_cb(uint8_t __rte_unused id, >uint8_t dev_id, > return ret; > } > >- pc->disable_implicit_release =3D 0; >+ pc->event_port_cfg =3D 0; > ret =3D rte_event_port_setup(dev_id, port_id, pc); > if (ret) { > RTE_EDEV_LOG_ERR("failed to setup event port %u\n", >diff --git a/lib/librte_eventdev/rte_eventdev.c >b/lib/librte_eventdev/rte_eventdev.c >index 82c177c..3a5b738 100644 >--- a/lib/librte_eventdev/rte_eventdev.c >+++ b/lib/librte_eventdev/rte_eventdev.c >@@ -32,6 +32,7 @@ > #include > #include > #include >+#include > > #include "rte_eventdev.h" > #include "rte_eventdev_pmd.h" >@@ -437,9 +438,29 @@ rte_event_dev_configure(uint8_t dev_id, > dev_id); > return -EINVAL; > } >- if (dev_conf->nb_event_queues > info.max_event_queues) { >- RTE_EDEV_LOG_ERR("%d nb_event_queues=3D%d > >max_event_queues=3D%d", >- dev_id, dev_conf->nb_event_queues, >info.max_event_queues); >+ if (dev_conf->nb_event_queues > info.max_event_queues + >+ info.max_single_link_event_port_queue_pairs) >{ >+ RTE_EDEV_LOG_ERR("%d nb_event_queues=3D%d > >max_event_queues=3D%d + >max_single_link_event_port_queue_pairs=3D%d", >+ dev_id, dev_conf->nb_event_queues, >+ info.max_event_queues, >+ >info.max_single_link_event_port_queue_pairs); >+ return -EINVAL; >+ } >+ if (dev_conf->nb_event_queues - >+ dev_conf->nb_single_link_event_port_queues > >+ info.max_event_queues) { >+ RTE_EDEV_LOG_ERR("id%d nb_event_queues=3D%d - >nb_single_link_event_port_queues=3D%d > max_event_queues=3D%d", >+ dev_id, dev_conf->nb_event_queues, >+ dev_conf- >>nb_single_link_event_port_queues, >+ info.max_event_queues); >+ return -EINVAL; >+ } >+ if (dev_conf->nb_single_link_event_port_queues > >+ dev_conf->nb_event_queues) { >+ RTE_EDEV_LOG_ERR("dev%d >nb_single_link_event_port_queues=3D%d > nb_event_queues=3D%d", >+ dev_id, >+ dev_conf- >>nb_single_link_event_port_queues, >+ dev_conf->nb_event_queues); > return -EINVAL; > } > >@@ -448,9 +469,31 @@ rte_event_dev_configure(uint8_t dev_id, > RTE_EDEV_LOG_ERR("dev%d nb_event_ports cannot >be zero", dev_id); > return -EINVAL; > } >- if (dev_conf->nb_event_ports > info.max_event_ports) { >- RTE_EDEV_LOG_ERR("id%d nb_event_ports=3D%d > >max_event_ports=3D %d", >- dev_id, dev_conf->nb_event_ports, >info.max_event_ports); >+ if (dev_conf->nb_event_ports > info.max_event_ports + >+ info.max_single_link_event_port_queue_pairs) >{ >+ RTE_EDEV_LOG_ERR("id%d nb_event_ports=3D%d > >max_event_ports=3D%d + max_single_link_event_port_queue_pairs=3D%d", >+ dev_id, dev_conf->nb_event_ports, >+ info.max_event_ports, >+ >info.max_single_link_event_port_queue_pairs); >+ return -EINVAL; >+ } >+ if (dev_conf->nb_event_ports - >+ dev_conf->nb_single_link_event_port_queues >+ > info.max_event_ports) { >+ RTE_EDEV_LOG_ERR("id%d nb_event_ports=3D%d - >nb_single_link_event_port_queues=3D%d > max_event_ports=3D%d", >+ dev_id, dev_conf->nb_event_ports, >+ dev_conf- >>nb_single_link_event_port_queues, >+ info.max_event_ports); >+ return -EINVAL; >+ } >+ >+ if (dev_conf->nb_single_link_event_port_queues > >+ dev_conf->nb_event_ports) { >+ RTE_EDEV_LOG_ERR( >+ "dev%d >nb_single_link_event_port_queues=3D%d > nb_event_ports=3D%d", >+ dev_id, >+ dev_conf- >>nb_single_link_event_port_queues, >+ dev_conf->nb_event_ports); > return -EINVAL; > } > >@@ -737,7 +780,8 @@ rte_event_port_setup(uint8_t dev_id, uint8_t >port_id, > return -EINVAL; > } > >- if (port_conf && port_conf->disable_implicit_release && >+ if (port_conf && >+ (port_conf->event_port_cfg & >RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL) && > !(dev->data->event_dev_cap & > RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE)) { > RTE_EDEV_LOG_ERR( >@@ -830,6 +874,14 @@ rte_event_port_attr_get(uint8_t dev_id, >uint8_t port_id, uint32_t attr_id, > case RTE_EVENT_PORT_ATTR_NEW_EVENT_THRESHOLD: > *attr_value =3D dev->data- >>ports_cfg[port_id].new_event_threshold; > break; >+ case RTE_EVENT_PORT_ATTR_IMPLICIT_RELEASE_DISABLE: >+ { >+ uint32_t config; >+ >+ config =3D dev->data- >>ports_cfg[port_id].event_port_cfg; >+ *attr_value =3D !!(config & >RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL); >+ break; >+ } > default: > return -EINVAL; > }; >diff --git a/lib/librte_eventdev/rte_eventdev.h >b/lib/librte_eventdev/rte_eventdev.h >index 7dc8323..ce1fc2c 100644 >--- a/lib/librte_eventdev/rte_eventdev.h >+++ b/lib/librte_eventdev/rte_eventdev.h >@@ -291,6 +291,12 @@ struct rte_event; > * single queue to each port or map a single queue to many port. > */ > >+#define RTE_EVENT_DEV_CAP_CARRY_FLOW_ID (1ULL << 9) >+/**< Event device preserves the flow ID from the enqueued >+ * event to the dequeued event if the flag is set. Otherwise, >+ * the content of this field is implementation dependent. >+ */ >+ > /* Event device priority levels */ > #define RTE_EVENT_DEV_PRIORITY_HIGHEST 0 > /**< Highest priority expressed across eventdev subsystem >@@ -380,6 +386,10 @@ struct rte_event_dev_info { > * event port by this device. > * A device that does not support bulk enqueue will set this as 1. > */ >+ uint8_t max_event_port_links; >+ /**< Maximum number of queues that can be linked to a single >event >+ * port by this device. >+ */ > int32_t max_num_events; > /**< A *closed system* event dev has a limit on the number of >events it > * can manage at a time. An *open system* event dev does not >have a >@@ -387,6 +397,12 @@ struct rte_event_dev_info { > */ > uint32_t event_dev_cap; > /**< Event device capabilities(RTE_EVENT_DEV_CAP_)*/ >+ uint8_t max_single_link_event_port_queue_pairs; >+ /**< Maximum number of event ports and queues that are >optimized for >+ * (and only capable of) single-link configurations supported by >this >+ * device. These ports and queues are not accounted for in >+ * max_event_ports or max_event_queues. >+ */ > }; > > /** >@@ -494,6 +510,14 @@ struct rte_event_dev_config { > */ > uint32_t event_dev_cfg; > /**< Event device config flags(RTE_EVENT_DEV_CFG_)*/ >+ uint8_t nb_single_link_event_port_queues; >+ /**< Number of event ports and queues that will be singly- >linked to >+ * each other. These are a subset of the overall event ports and >+ * queues; this value cannot exceed *nb_event_ports* or >+ * *nb_event_queues*. If the device has ports and queues that >are >+ * optimized for single-link usage, this field is a hint for how >many >+ * to allocate; otherwise, regular event ports and queues can be >used. >+ */ > }; > > /** >@@ -519,7 +543,6 @@ int > rte_event_dev_configure(uint8_t dev_id, > const struct rte_event_dev_config *dev_conf); > >- > /* Event queue specific APIs */ > > /* Event queue configuration bitmap flags */ >@@ -671,6 +694,20 @@ rte_event_queue_attr_get(uint8_t dev_id, >uint8_t queue_id, uint32_t attr_id, > > /* Event port specific APIs */ > >+/* Event port configuration bitmap flags */ >+#define RTE_EVENT_PORT_CFG_DISABLE_IMPL_REL (1ULL << 0) >+/**< Configure the port not to release outstanding events in >+ * rte_event_dev_dequeue_burst(). If set, all events received through >+ * the port must be explicitly released with RTE_EVENT_OP_RELEASE >or >+ * RTE_EVENT_OP_FORWARD. Must be unset if the device is not >+ * RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE capable. >+ */ >+#define RTE_EVENT_PORT_CFG_SINGLE_LINK (1ULL << 1) >+/**< This event port links only to a single event queue. >+ * >+ * @see rte_event_port_setup(), rte_event_port_link() >+ */ >+ > /** Event port configuration structure */ > struct rte_event_port_conf { > int32_t new_event_threshold; >@@ -698,13 +735,7 @@ struct rte_event_port_conf { > * which previously supplied to rte_event_dev_configure(). > * Ignored when device is not >RTE_EVENT_DEV_CAP_BURST_MODE capable. > */ >- uint8_t disable_implicit_release; >- /**< Configure the port not to release outstanding events in >- * rte_event_dev_dequeue_burst(). If true, all events received >through >- * the port must be explicitly released with >RTE_EVENT_OP_RELEASE or >- * RTE_EVENT_OP_FORWARD. Must be false when the device is >not >- * RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE capable. >- */ >+ uint32_t event_port_cfg; /**< Port cfg >flags(EVENT_PORT_CFG_) */ > }; > > /** >@@ -769,6 +800,10 @@ rte_event_port_setup(uint8_t dev_id, uint8_t >port_id, > * The new event threshold of the port > */ > #define RTE_EVENT_PORT_ATTR_NEW_EVENT_THRESHOLD 2 >+/** >+ * The implicit release disable attribute of the port >+ */ >+#define RTE_EVENT_PORT_ATTR_IMPLICIT_RELEASE_DISABLE 3 > > /** > * Get an attribute from a port. >diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h >b/lib/librte_eventdev/rte_eventdev_pmd_pci.h >index 443cd38..a3f9244 100644 >--- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h >+++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h >@@ -88,7 +88,6 @@ rte_event_pmd_pci_probe(struct rte_pci_driver >*pci_drv, > return -ENXIO; > } > >- > /** > * @internal > * Wrapper for use by pci drivers as a .remove function to detach a >event >diff --git a/lib/librte_eventdev/rte_eventdev_trace.h >b/lib/librte_eventdev/rte_eventdev_trace.h >index 4de6341..5ec43d8 100644 >--- a/lib/librte_eventdev/rte_eventdev_trace.h >+++ b/lib/librte_eventdev/rte_eventdev_trace.h >@@ -34,6 +34,7 @@ RTE_TRACE_POINT( > rte_trace_point_emit_u32(dev_conf- >>nb_event_port_dequeue_depth); > rte_trace_point_emit_u32(dev_conf- >>nb_event_port_enqueue_depth); > rte_trace_point_emit_u32(dev_conf->event_dev_cfg); >+ rte_trace_point_emit_u8(dev_conf- >>nb_single_link_event_port_queues); > rte_trace_point_emit_int(rc); > ) > >@@ -59,7 +60,7 @@ RTE_TRACE_POINT( > rte_trace_point_emit_i32(port_conf->new_event_threshold); > rte_trace_point_emit_u16(port_conf->dequeue_depth); > rte_trace_point_emit_u16(port_conf->enqueue_depth); >- rte_trace_point_emit_u8(port_conf->disable_implicit_release); >+ rte_trace_point_emit_u32(port_conf->event_port_cfg); > rte_trace_point_emit_int(rc); > ) > >@@ -165,7 +166,7 @@ RTE_TRACE_POINT( > rte_trace_point_emit_i32(port_conf->new_event_threshold); > rte_trace_point_emit_u16(port_conf->dequeue_depth); > rte_trace_point_emit_u16(port_conf->enqueue_depth); >- rte_trace_point_emit_u8(port_conf->disable_implicit_release); >+ rte_trace_point_emit_u32(port_conf->event_port_cfg); > rte_trace_point_emit_ptr(conf_cb); > rte_trace_point_emit_int(rc); > ) >@@ -257,7 +258,7 @@ RTE_TRACE_POINT( > rte_trace_point_emit_i32(port_conf->new_event_threshold); > rte_trace_point_emit_u16(port_conf->dequeue_depth); > rte_trace_point_emit_u16(port_conf->enqueue_depth); >- rte_trace_point_emit_u8(port_conf->disable_implicit_release); >+ rte_trace_point_emit_u32(port_conf->event_port_cfg); > ) > > RTE_TRACE_POINT( >diff --git a/lib/librte_eventdev/rte_eventdev_version.map >b/lib/librte_eventdev/rte_eventdev_version.map >index 3d9d0ca..2846d04 100644 >--- a/lib/librte_eventdev/rte_eventdev_version.map >+++ b/lib/librte_eventdev/rte_eventdev_version.map >@@ -100,7 +100,6 @@ EXPERIMENTAL { > # added in 20.05 > __rte_eventdev_trace_configure; > __rte_eventdev_trace_queue_setup; >- __rte_eventdev_trace_port_setup; > __rte_eventdev_trace_port_link; > __rte_eventdev_trace_port_unlink; > __rte_eventdev_trace_start; >@@ -134,4 +133,7 @@ EXPERIMENTAL { > __rte_eventdev_trace_crypto_adapter_queue_pair_del; > __rte_eventdev_trace_crypto_adapter_start; > __rte_eventdev_trace_crypto_adapter_stop; >+ >+ # changed in 20.11 >+ __rte_eventdev_trace_port_setup; > }; >-- >2.6.4