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 34AFF41D52 for ; Thu, 23 Feb 2023 16:07:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 60B9343266; Thu, 23 Feb 2023 16:07:38 +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 A759943259 for ; Thu, 23 Feb 2023 16:07:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164856; 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=PogA4kXbnR8kTbCXqmjorqzY9m230TdAc+/kB++wldQ=; b=DlKyfBtqmsewZuJzXsAR78rj5tNwMcahtP4ZLdxwMowqfo+GVvpxC8H+HIm4DCXc3LXide Yj/WRjB+0j8U+DAuPavF17wxMLVbHhsQ3QbJYbzixNxiKrYHWvzkb9OchhPvtXHxIDeWBj jBiQ2piOsarUJ/G7wjVg4deO3ZkTMuc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-67-undDvPdjMDWpoBBrB9gtjA-1; Thu, 23 Feb 2023 10:07:34 -0500 X-MC-Unique: undDvPdjMDWpoBBrB9gtjA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 485C1803493; Thu, 23 Feb 2023 15:07:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB9B12166B29; Thu, 23 Feb 2023 15:07:33 +0000 (UTC) From: Kevin Traynor To: Rahul Bhansali Cc: dpdk stable Subject: patch 'event/cnxk: wait for CPT flow control on WQE path' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:28 +0000 Message-Id: <20230223150631.723699-37-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. 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/da4a271c759b7107ca241d5302bb00017b3e4472 Thanks. Kevin --- >From da4a271c759b7107ca241d5302bb00017b3e4472 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 19 Jan 2023 11:23:15 +0530 Subject: [PATCH] event/cnxk: wait for CPT flow control on WQE path [ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ] Wait for CPT flow control on WQE path to avoid CPT queue overflow and thereby a CPT misc interrupt. Fixes: 1a7da795f64a ("net/cnxk: support Tx security offload on cn9k") Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cn9k_worker.h | 1 + drivers/net/cnxk/cn9k_tx.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h index 8abdd13b66..695e3ae429 100644 --- a/drivers/event/cnxk/cn9k_worker.h +++ b/drivers/event/cnxk/cn9k_worker.h @@ -586,4 +586,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base, rte_io_wmb(); cn9k_sso_txq_fc_wait(txq); + cn9k_nix_sec_fc_wait_one(txq); /* Write CPT instruction to lmt line */ diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 66a59ab533..fe44ff4290 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -343,4 +343,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags) } +static __rte_always_inline void +cn9k_nix_sec_fc_wait_one(const struct cn9k_eth_txq *txq) +{ + uint64_t nb_desc = txq->cpt_desc; + uint64_t *fc = txq->cpt_fc; + + while (nb_desc <= __atomic_load_n(fc, __ATOMIC_RELAXED)) + ; +} + static __rte_always_inline uint64_t cn9k_nix_xmit_submit_lmt(const rte_iova_t io_addr) -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.726897048 +0000 +++ 0037-event-cnxk-wait-for-CPT-flow-control-on-WQE-path.patch 2023-02-23 14:46:23.759235928 +0000 @@ -1 +1 @@ -From d6ef4695c3b449259b29225e62bb6116ad420227 Mon Sep 17 00:00:00 2001 +From da4a271c759b7107ca241d5302bb00017b3e4472 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4c3932da47..d3c5180fbc 100644 +index 8abdd13b66..695e3ae429 100644 @@ -22 +23 @@ -@@ -731,4 +731,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base, +@@ -586,4 +586,5 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base, @@ -29 +30 @@ -index 404edd6aed..7362025a34 100644 +index 66a59ab533..fe44ff4290 100644 @@ -32 +33 @@ -@@ -389,4 +389,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags) +@@ -343,4 +343,14 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)