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 5547AA034F for ; Tue, 1 Mar 2022 11:43:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E9F0426DC; Tue, 1 Mar 2022 11:43:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C9BB7407FF for ; Tue, 1 Mar 2022 11:43:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LejeaRd6GUhUt6f2ZhpdrF1DpfDezQs06UEcRw+1ems=; b=BEoZxU7pySY8OheqvqK5WtaXo624M1PcD+D91prJDAN/3LQf9Fh/7s5PhbCpnELYbdyh2x vALKwXT1ZFM4G34MtDC2xHptkDnZ6U9x8yJDdAmRYNdlzNAuGfCImi6WF86j6iwn4cgCfl Sl2Zck+Lrvo2caDzvVu7JBZ7EjTqnE0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-Wi1pltgbNamEGlwEvy8l3A-1; Tue, 01 Mar 2022 05:43:48 -0500 X-MC-Unique: Wi1pltgbNamEGlwEvy8l3A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10FEF100C609; Tue, 1 Mar 2022 10:43:47 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E53275549; Tue, 1 Mar 2022 10:43:45 +0000 (UTC) From: Kevin Traynor To: Timothy McDaniel Cc: dpdk stable Subject: patch 'event/dlb2: update rolling mask used for dequeue' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:37 +0000 Message-Id: <20220301104300.334382-21-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/720fb431b46a03ccfdd8c080ce11d322f174a377 Thanks. Kevin --- >From 720fb431b46a03ccfdd8c080ce11d322f174a377 Mon Sep 17 00:00:00 2001 From: Timothy McDaniel Date: Wed, 16 Feb 2022 13:38:26 -0600 Subject: [PATCH] event/dlb2: update rolling mask used for dequeue [ upstream commit e697f35dbdd1f4868b452d17a0cb11783f61690d ] Update the rolling mask used in dequeue operations to fix the vector optimized dequeue. Fixes: 000a7b8e7582 ("event/dlb2: optimize dequeue operation") Signed-off-by: Timothy McDaniel --- drivers/event/dlb2/dlb2.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c index d75f12e382..09abdd1660 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -3898,29 +3898,43 @@ dlb2_hw_dequeue_sparse(struct dlb2_eventdev *dlb2, struct dlb2_dequeue_qe qes[DLB2_NUM_QES_PER_CACHE_LINE]; int num_avail; + if (use_scalar) { + int n_iter = 0; + uint64_t m_rshift, m_lshift, m2_rshift, m2_lshift; + num_avail = dlb2_recv_qe_sparse(qm_port, qes); num_avail = RTE_MIN(num_avail, max_num - num); dlb2_inc_cq_idx(qm_port, num_avail << 2); if (num_avail == DLB2_NUM_QES_PER_CACHE_LINE) - num += dlb2_process_dequeue_four_qes(ev_port, - qm_port, - &events[num], - &qes[0]); + n_iter = dlb2_process_dequeue_four_qes(ev_port, + qm_port, + &events[num], + &qes[0]); else if (num_avail) - num += dlb2_process_dequeue_qes(ev_port, + n_iter = dlb2_process_dequeue_qes(ev_port, qm_port, &events[num], &qes[0], num_avail); + num += n_iter; + /* update rolling_mask for vector code support */ + m_rshift = qm_port->cq_rolling_mask >> n_iter; + m_lshift = qm_port->cq_rolling_mask << (64 - n_iter); + m2_rshift = qm_port->cq_rolling_mask_2 >> n_iter; + m2_lshift = qm_port->cq_rolling_mask_2 << + (64 - n_iter); + qm_port->cq_rolling_mask = (m_rshift | m2_lshift); + qm_port->cq_rolling_mask_2 = (m2_rshift | m_lshift); } else { /* !use_scalar */ num_avail = dlb2_recv_qe_sparse_vec(qm_port, &events[num], max_num - num); + dlb2_inc_cq_idx(qm_port, num_avail << 2); num += num_avail; - dlb2_inc_cq_idx(qm_port, num_avail << 2); DLB2_INC_STAT(ev_port->stats.traffic.rx_ok, num_avail); } if (!num_avail) { - if (num > 0) + if ((timeout == 0) || (num > 0)) + /* Not waiting in any form or 1+ events recd */ break; else if (dlb2_dequeue_wait(dlb2, ev_port, qm_port, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.956050319 +0000 +++ 0021-event-dlb2-update-rolling-mask-used-for-dequeue.patch 2022-03-01 10:41:01.265244090 +0000 @@ -1 +1 @@ -From e697f35dbdd1f4868b452d17a0cb11783f61690d Mon Sep 17 00:00:00 2001 +From 720fb431b46a03ccfdd8c080ce11d322f174a377 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e697f35dbdd1f4868b452d17a0cb11783f61690d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org