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 29FBF46BAE for ; Fri, 18 Jul 2025 21:35:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2285840611; Fri, 18 Jul 2025 21:35:30 +0200 (CEST) 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 E26B340E30 for ; Fri, 18 Jul 2025 21:35:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867328; 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=WyoXLcN2TkvjkleIVnnu6XFyTrw6r+JhXngYonn3sbQ=; b=iHtqDV0vJ9daeGGROnNEJHG8QJ92000C+BtjRUu2i3fmclm9LHGrs6GpPb+bz53S2kLt5k hUJoAH8IsxTybF49I3OiYxeuurm3vT0cd1WeTISiAs0ZaZUzIuSsJPNuOpSkqD3CvjViB/ gLhxZkknttrJuZtvsC6pwCbortQcBFU= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-igbVeedwNBCaiQ1o10tS8w-1; Fri, 18 Jul 2025 15:35:24 -0400 X-MC-Unique: igbVeedwNBCaiQ1o10tS8w-1 X-Mimecast-MFC-AGG-ID: igbVeedwNBCaiQ1o10tS8w_1752867323 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 24F8E1956080; Fri, 18 Jul 2025 19:35:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D845518003FC; Fri, 18 Jul 2025 19:35:21 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: dpdk stable Subject: patch 'common/cnxk: fix CQ tail drop' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:05 +0100 Message-ID: <20250718193247.1008129-71-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tNc--D6OvdGxzxF1M68PuwT00x4sWijY5fgvuApzs0I_1752867323 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 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. 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/14213101c2ea12410489ee66a484907a54c3612c Thanks. Kevin --- >From 14213101c2ea12410489ee66a484907a54c3612c Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Wed, 28 May 2025 17:21:16 +0530 Subject: [PATCH] common/cnxk: fix CQ tail drop [ upstream commit dc8f10bb36bbd9dd961e4baba693181add66c962 ] CQ tail drop feature is currently supposed to be enabled when inline IPsec is disabled. But since XQE drop is not enabled, CQ tail drop is implicitly disabled. Fix the same. Fixes: c8c967e11717 ("common/cnxk: support enabling AURA tail drop for RQ") Signed-off-by: Nithin Dabilpuram --- drivers/common/cnxk/roc_nix.h | 2 ++ drivers/common/cnxk/roc_nix_queue.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h index f213823b9b..e2df09c75e 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -355,4 +355,6 @@ struct roc_nix_rq { /* SPB aura drop enable */ bool spb_drop_ena; + /* XQE drop enable */ + bool xqe_drop_ena; /* End of Input parameters */ struct roc_nix *roc_nix; diff --git a/drivers/common/cnxk/roc_nix_queue.c b/drivers/common/cnxk/roc_nix_queue.c index e852211ba4..39bd051c94 100644 --- a/drivers/common/cnxk/roc_nix_queue.c +++ b/drivers/common/cnxk/roc_nix_queue.c @@ -531,5 +531,5 @@ nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, /* Many to one reduction */ aq->rq.qint_idx = rq->qid % qints; - aq->rq.xqe_drop_ena = 1; + aq->rq.xqe_drop_ena = rq->xqe_drop_ena; /* If RED enabled, then fill enable for all cases */ @@ -614,4 +614,5 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf aq->rq.wqe_caching = 1; + aq->rq.xqe_drop_ena = 0; aq->rq.good_utag = rq->tag_mask >> 24; aq->rq.bad_utag = rq->tag_mask >> 24; @@ -633,4 +634,6 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf aq->rq.ltag = rq->tag_mask & BITMASK_ULL(24, 0); aq->rq.cq = rq->cqid; + if (rq->xqe_drop_ena) + aq->rq.xqe_drop_ena = 1; } @@ -681,5 +684,4 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf /* Many to one reduction */ aq->rq.qint_idx = rq->qid % qints; - aq->rq.xqe_drop_ena = 0; aq->rq.lpb_drop_ena = rq->lpb_drop_ena; aq->rq.spb_drop_ena = rq->spb_drop_ena; @@ -726,4 +728,5 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf aq->rq_mask.ltag = ~aq->rq_mask.ltag; aq->rq_mask.cq = ~aq->rq_mask.cq; + aq->rq_mask.xqe_drop_ena = ~aq->rq_mask.xqe_drop_ena; } @@ -951,4 +954,8 @@ roc_nix_rq_init(struct roc_nix *roc_nix, struct roc_nix_rq *rq, bool ena) rq->tc = ROC_NIX_PFC_CLASS_INVALID; + /* Enable XQE/CQ drop on cn10k to count pkt drops only when inline is disabled */ + if (roc_model_is_cn10k() && !roc_nix_inl_inb_is_enabled(roc_nix)) + rq->xqe_drop_ena = true; + if (is_cn9k) rc = nix_rq_cn9k_cfg(dev, rq, nix->qints, false, ena); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.512200897 +0100 +++ 0071-common-cnxk-fix-CQ-tail-drop.patch 2025-07-18 20:29:10.971907457 +0100 @@ -1 +1 @@ -From dc8f10bb36bbd9dd961e4baba693181add66c962 Mon Sep 17 00:00:00 2001 +From 14213101c2ea12410489ee66a484907a54c3612c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc8f10bb36bbd9dd961e4baba693181add66c962 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 80392e7e1b..1e543d8f11 100644 +index f213823b9b..e2df09c75e 100644 @@ -23 +24 @@ -@@ -356,4 +356,6 @@ struct roc_nix_rq { +@@ -355,4 +355,6 @@ struct roc_nix_rq {