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 BDD67A0597; Wed, 8 Apr 2020 19:57:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4F9F1C1E3; Wed, 8 Apr 2020 19:57:26 +0200 (CEST) Received: from mail.lysator.liu.se (mail.lysator.liu.se [130.236.254.3]) by dpdk.org (Postfix) with ESMTP id 2EE991C124 for ; Wed, 8 Apr 2020 19:57:23 +0200 (CEST) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id D25F640028 for ; Wed, 8 Apr 2020 19:57:22 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id C88D340027; Wed, 8 Apr 2020 19:57:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.4.2 X-Spam-Score: -0.9 Received: from isengard.friendlyfire.se (host-95-205-2-251.mobileonline.telia.com [95.205.2.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 6335A4001B; Wed, 8 Apr 2020 19:57:21 +0200 (CEST) From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= To: dev@dpdk.org, Jerin Jacob Cc: Gage Eads , Bruce Richardson , =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Date: Wed, 8 Apr 2020 19:56:55 +0200 Message-Id: <20200408175655.18879-3-mattias.ronnblom@ericsson.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408175655.18879-1-mattias.ronnblom@ericsson.com> References: <20200408175655.18879-1-mattias.ronnblom@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [RFC 3/3] eventdev: allow devices requiring maintenance with adapters 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" Introduce support for event devices requiring calls to rte_event_maintain() in the Ethernet RX, Timer and Crypto Eventdev adapters. Signed-off-by: Mattias Rönnblom --- lib/librte_eventdev/rte_event_crypto_adapter.c | 16 +++++++++++----- lib/librte_eventdev/rte_event_eth_rx_adapter.c | 3 +++ lib/librte_eventdev/rte_event_timer_adapter.c | 4 +++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index 22d910816..e1bb9d4ab 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -625,19 +625,25 @@ static void eca_crypto_adapter_run(struct rte_event_crypto_adapter *adapter, unsigned int max_ops) { - while (max_ops) { + unsigned int ops_left = max_ops; + + while (ops_left > 0) { unsigned int e_cnt, d_cnt; - e_cnt = eca_crypto_adapter_deq_run(adapter, max_ops); - max_ops -= RTE_MIN(max_ops, e_cnt); + e_cnt = eca_crypto_adapter_deq_run(adapter, ops_left); + ops_left -= RTE_MIN(ops_left, e_cnt); - d_cnt = eca_crypto_adapter_enq_run(adapter, max_ops); - max_ops -= RTE_MIN(max_ops, d_cnt); + d_cnt = eca_crypto_adapter_enq_run(adapter, ops_left); + ops_left -= RTE_MIN(ops_left, d_cnt); if (e_cnt == 0 && d_cnt == 0) break; } + + if (ops_left == max_ops) + rte_event_maintain(adapter->eventdev_id, + adapter->event_port_id); } static int diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c index 95dd47820..e6eb6e63f 100644 --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c @@ -852,6 +852,9 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter, if (buf->count > 0) rxa_flush_event_buffer(rx_adapter); + else + rte_event_maintain(rx_adapter->eventdev_id, + rx_adapter->event_port_id); return nb_rx; } diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/librte_eventdev/rte_event_timer_adapter.c index 161e21a68..66b42ee3d 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.c +++ b/lib/librte_eventdev/rte_event_timer_adapter.c @@ -741,7 +741,9 @@ swtim_service_func(void *arg) sw->stats.ev_enq_count += nb_evs_flushed; sw->stats.ev_inv_count += nb_evs_invalid; sw->stats.adapter_tick_count++; - } + } else + rte_event_maintain(adapter->data->event_dev_id, + adapter->data->event_port_id); return 0; } -- 2.20.1