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 72E65A0543 for ; Mon, 6 Jun 2022 17:44:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DB274161A; Mon, 6 Jun 2022 17:44:57 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 474254021E; Mon, 6 Jun 2022 17:44:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654530295; x=1686066295; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=QtGnqxHwbSIrRkw/R3mztLSnOPHCLW3atTScnkC3yTw=; b=V7f6j2E1y8dqWZrTOVC67plZyVTXowMlNjqdOMeQmatLAvdnfbyrJwCV wJ1PEtr80w4hmPWXwKBBVpkaufZ8Sr87fUEcYF/8kshpgcvULj8LIYK33 30jNAYWs9K6rXKan4m/S55yFJnVxu0S5TH+gBkXls+yQ2Hwy/sKFv6fti omxnj+amafZYD1NtOW6hLM+i2ohs341wYkNO/uT7d9md4cYC+YXBSIKw6 XTBbRxQWyCZkORvAZDYSTCCD1QiozHOfqSrqtNC5ThqIAbRpAP3IW9o7C SSbXnbkAtpTgFgCbzGxIEPdn65j6CEml3ZllJnqPXDTIRNG7bhoL7ETo7 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337647252" X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="337647252" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2022 08:28:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="669526513" Received: from txanpdk02.an.intel.com ([10.123.117.76]) by FMSMGA003.fm.intel.com with ESMTP; 06 Jun 2022 08:28:42 -0700 From: Timothy McDaniel To: jerinj@marvell.com Cc: dev@dpdk.org, stable@dpdk.org Subject: [PATCH] event/dlb2: improve enqueue efficiency Date: Mon, 6 Jun 2022 10:28:40 -0500 Message-Id: <20220606152840.733080-1-timothy.mcdaniel@intel.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Validate credit configuration. If user tried to send 64 events, it will take 64 credits. Enqueue API only gets 32 credits each time. If it does not have sufficient credits, it just fails and returns. Enqueue API does not retry. On next enqueue, it will get 32 more and send will work. This results in alternate enqueues failing. Add check to make sure DLB2_MAX_ENQUEUE_DEPTH <= both DLB2_SW_CREDIT_QUANTA_DEFAULT and DLB2_SW_CREDIT_BATCH_SZ. Add enough retires in the driver to satisfy max enqueue depth credits based on set quanta. Note the credit quanta size is different for each port. Retry count = Max enqueue depth / credit quanta in driver before returning no credit. Fixes: 3a6d0c04e7fb ("event/dlb2: add port setup") Cc: stable@dpdk.org Signed-off-by: Timothy McDaniel --- drivers/event/dlb2/dlb2.c | 78 +++++++++++++++++++++++++--------- drivers/event/dlb2/dlb2_priv.h | 3 +- 2 files changed, 60 insertions(+), 21 deletions(-) diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c index 36f07d0061..3641ed2942 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -387,6 +387,11 @@ set_sw_credit_quanta(const char *key __rte_unused, if (ret < 0) return ret; + if (*sw_credit_quanta <= 0) { + DLB2_LOG_ERR("sw_credit_quanta must be > 0\n"); + return -EINVAL; + } + return 0; } @@ -1773,9 +1778,48 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, return -EINVAL; } + /* Default for worker ports */ + sw_credit_quanta = dlb2->sw_credit_quanta; + hw_credit_quanta = dlb2->hw_credit_quanta; + ev_port->qm_port.is_directed = port_conf->event_port_cfg & RTE_EVENT_PORT_CFG_SINGLE_LINK; + /* + * Validate credit config before creating port + */ + + /* Default for worker ports */ + sw_credit_quanta = dlb2->sw_credit_quanta; + hw_credit_quanta = dlb2->hw_credit_quanta; + + if (port_conf->event_port_cfg & RTE_EVENT_PORT_CFG_HINT_PRODUCER) { + /* Producer type ports. Mostly enqueue */ + sw_credit_quanta = DLB2_SW_CREDIT_P_QUANTA_DEFAULT; + hw_credit_quanta = DLB2_SW_CREDIT_P_BATCH_SZ; + } + if (port_conf->event_port_cfg & RTE_EVENT_PORT_CFG_HINT_CONSUMER) { + /* Consumer type ports. Mostly dequeue */ + sw_credit_quanta = DLB2_SW_CREDIT_C_QUANTA_DEFAULT; + hw_credit_quanta = DLB2_SW_CREDIT_C_BATCH_SZ; + } + ev_port->credit_update_quanta = sw_credit_quanta; + ev_port->qm_port.hw_credit_quanta = hw_credit_quanta; + + if (port_conf->enqueue_depth > sw_credit_quanta || + port_conf->enqueue_depth > hw_credit_quanta) { + DLB2_LOG_ERR("Invalid port config. Enqueue depth %d must be <= credit quanta %d and batch size %d\n", + port_conf->enqueue_depth, + sw_credit_quanta, + hw_credit_quanta); + return -EINVAL; + } + ev_port->enq_retries = port_conf->enqueue_depth / sw_credit_quanta; + + /* + * Create port + */ + if (!ev_port->qm_port.is_directed) { ret = dlb2_hw_create_ldb_port(dlb2, ev_port, @@ -1811,23 +1855,6 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, ev_port->inflight_credits = 0; ev_port->dlb2 = dlb2; /* reverse link */ - /* Default for worker ports */ - sw_credit_quanta = dlb2->sw_credit_quanta; - hw_credit_quanta = dlb2->hw_credit_quanta; - - if (port_conf->event_port_cfg & RTE_EVENT_PORT_CFG_HINT_PRODUCER) { - /* Producer type ports. Mostly enqueue */ - sw_credit_quanta = DLB2_SW_CREDIT_P_QUANTA_DEFAULT; - hw_credit_quanta = DLB2_SW_CREDIT_P_BATCH_SZ; - } - if (port_conf->event_port_cfg & RTE_EVENT_PORT_CFG_HINT_CONSUMER) { - /* Consumer type ports. Mostly dequeue */ - sw_credit_quanta = DLB2_SW_CREDIT_C_QUANTA_DEFAULT; - hw_credit_quanta = DLB2_SW_CREDIT_C_BATCH_SZ; - } - ev_port->credit_update_quanta = sw_credit_quanta; - ev_port->qm_port.hw_credit_quanta = hw_credit_quanta; - /* Tear down pre-existing port->queue links */ if (dlb2->run_state == DLB2_RUN_STATE_STOPPED) dlb2_port_link_teardown(dlb2, &dlb2->ev_ports[ev_port_id]); @@ -2970,6 +2997,7 @@ __dlb2_event_enqueue_burst(void *event_port, struct dlb2_eventdev_port *ev_port = event_port; struct dlb2_port *qm_port = &ev_port->qm_port; struct process_local_port_data *port_data; + int retries = ev_port->enq_retries; int i; RTE_ASSERT(ev_port->enq_configured); @@ -2993,6 +3021,7 @@ __dlb2_event_enqueue_burst(void *event_port, for (; j < DLB2_NUM_QES_PER_CACHE_LINE && (i + j) < num; j++) { const struct rte_event *ev = &events[i + j]; int16_t thresh = qm_port->token_pop_thresh; + int ret; if (use_delayed && qm_port->token_pop_mode == DELAYED_POP && @@ -3014,9 +3043,18 @@ __dlb2_event_enqueue_burst(void *event_port, break; } - if (dlb2_event_enqueue_prep(ev_port, qm_port, ev, - &sched_types[j], - &queue_ids[j])) + /* + * Retry if insufficient credits + */ + do { + ret = dlb2_event_enqueue_prep(ev_port, + qm_port, + ev, + &sched_types[j], + &queue_ids[j]); + } while ((ret == -ENOSPC) && (retries-- > 0)); + + if (ret != 0) break; } diff --git a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h index 3e47e4776b..4a06d649ab 100644 --- a/drivers/event/dlb2/dlb2_priv.h +++ b/drivers/event/dlb2/dlb2_priv.h @@ -114,7 +114,7 @@ #define DLB2_NUM_QES_PER_CACHE_LINE 4 -#define DLB2_MAX_ENQUEUE_DEPTH 64 +#define DLB2_MAX_ENQUEUE_DEPTH 32 #define DLB2_MIN_ENQUEUE_DEPTH 4 #define DLB2_NAME_SIZE 64 @@ -519,6 +519,7 @@ struct dlb2_eventdev_port { */ uint16_t outstanding_releases; uint16_t inflight_max; /* app requested max inflights for this port */ + int enq_retries; /* Number of attempts before ret ENOSPC */ /* setup_done is set when the event port is setup */ bool setup_done; /* enq_configured is set when the qm port is created */ -- 2.25.1