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 8D354468E4 for ; Thu, 12 Jun 2025 23:10:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 87BFF42E0C; Thu, 12 Jun 2025 23:10:20 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 8B3AB42E62 for ; Thu, 12 Jun 2025 23:10:19 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4530921461aso13061075e9.0 for ; Thu, 12 Jun 2025 14:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762619; x=1750367419; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SmzBqdTCuQ52y3KdTT2JHQELWoYioPDwTik8urVjdEM=; b=NewUNVXBcsyZJdJ9KCHbNdqjyNKuN/oDLnOtRAfUlCeYM5u7EcOBuhhvtdQP0cfSPd 8DZyHiphKOcD1TMHe3uoWRFfWk/yiqeX340nzqO3495iYd0ybINoAEk8HubhUOZRaxkb 3ifoqxRneMXomHNeBMFs61J/gMD/PmMzQsvz6++7LC8Jmtle5wETX/P/s4lHDXEOr/qA F5G4sNxnSiOoDHz1ZbnrAakrv6yunaM5te+g3EJdQGUnaVDVh0sbd/LP+nWO/FC9Vubs P4WH3g2QCBdiPmgz1RiRc0faijPYWcntLVAKrgyGic2yg7BtV1KODp1vPcHQx8QGraYt H76w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762619; x=1750367419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SmzBqdTCuQ52y3KdTT2JHQELWoYioPDwTik8urVjdEM=; b=BM3HWCWM0EhRjX6EAHFCKGlAoZ8+QHQ3dOhglmhNobdEKJFBPUfqC0fm+4MzWwBIoz AEenlKVRgpOur2493v9xGkMosE9KXJBJC9+rT/kLfJldU9MsWaBh5eHXO6t87FEpDc/G hB/ob6k/aGr5mDAuudqZpD103wKecAdEM2iVnkI1y2HIVrdr+TW/TrwMoHIddzcxOwpr q6STAklNvOkduNJ8ddriGnUQKsIiYsEiiBtqlnYWmBQ7hlrLnzm8d6kC+Hu/ZpFyDWzK l2duNKzV78BbFFin94EjDa+6ftHut52upw/mVTF7SAKgwJSeUSo707PuYZPkwB8m0za+ I4dQ== X-Gm-Message-State: AOJu0YxnPWcM7FiJAUSnVFU0BSLAbMkRREK7WzyWWbyYbWRdcNvnIqej BFjbK4jUjIePTqZH7RZ9jaZodbeS9FFB+Upy93CU7SL2nQGono/xdbD9XgzrjxHF X-Gm-Gg: ASbGnctERCpK/Gv01MlIyUQCKG/US9RbYjuPV/509uMD6oh/acwC1UnOHaS0Ji7xMby 3WnAmrMJei42icaAHdw5wil0QALPDG6ZRxmarG22Voeekp3tz6acOdkQVtARdBHFA7nt++D7uPY MWogiXrkCL5SH3H0ej3dmMlz9cv6Mvfya1+GEzux3PG6ea0lf+QGIGllzvpcu8Yz5q7wpC0rfKf yob3pZ5iOflobXOgIgFsIo5XwaRfHFfNj3Xpd5nBcUh9aiVU+yjcdNUTT9vAwkgIttkEZDz3Nlv k2ksq0WifINZYw9y7MR1EAy1/S6F7K2OTb8dy3k6m2jpp9s0SPlC6tQy1LwmkS5ntIqr X-Google-Smtp-Source: AGHT+IHfR47+I4f2/pL59ukklGuIIjAxiBF0hkzltW5uM/lVbqhrnKYfi8XqfIdQtdrBi5jmlzgp3Q== X-Received: by 2002:a05:600c:4e16:b0:43d:fa58:81d3 with SMTP id 5b1f17b1804b1-45334af6f9emr4481995e9.32.1749762618984; Thu, 12 Jun 2025 14:10:18 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b087a9sm380170f8f.55.2025.06.12.14.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Nithin Dabilpuram Cc: dpdk stable Subject: patch 'common/cnxk: fix CQ tail drop' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:07 +0100 Message-ID: <20250612210733.2506558-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> 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 Hi, FYI, your patch has been queued to stable release 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/dd587a6b20ccf9e2a7f604d0a6e9e532fdc0b179 Thanks. Luca Boccassi --- >From dd587a6b20ccf9e2a7f604d0a6e9e532fdc0b179 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 1125fff020..fc4126f5bb 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -322,6 +322,8 @@ struct roc_nix_rq { bool lpb_drop_ena; /* SPB aura drop enable */ bool spb_drop_ena; + /* XQE drop enable */ + bool xqe_drop_ena; /* End of Input parameters */ struct roc_nix *roc_nix; uint64_t meta_aura_handle; diff --git a/drivers/common/cnxk/roc_nix_queue.c b/drivers/common/cnxk/roc_nix_queue.c index 1cb1fd2101..965ebc7a1f 100644 --- a/drivers/common/cnxk/roc_nix_queue.c +++ b/drivers/common/cnxk/roc_nix_queue.c @@ -333,7 +333,7 @@ nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, aq->rq.rq_int_ena = 0; /* 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 */ if (rq->red_pass && (rq->red_pass >= rq->red_drop)) { @@ -417,6 +417,7 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, aq->rq.wqe_skip = rq->wqe_skip; 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; aq->rq.ltag = rq->tag_mask & BITMASK_ULL(24, 0); @@ -436,6 +437,8 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, aq->rq.bad_utag = rq->tag_mask >> 24; 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; } if (rq->ipsech_ena) { @@ -481,7 +484,6 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, aq->rq.rq_int_ena = 0; /* 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; @@ -526,6 +528,7 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, aq->rq_mask.bad_utag = ~aq->rq_mask.bad_utag; 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; } if (rq->ipsech_ena) @@ -626,6 +629,10 @@ roc_nix_rq_init(struct roc_nix *roc_nix, struct roc_nix_rq *rq, bool ena) rq->roc_nix = roc_nix; + /* 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); else -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.709938028 +0100 +++ 0050-common-cnxk-fix-CQ-tail-drop.patch 2025-06-12 22:06:23.878044807 +0100 @@ -1 +1 @@ -From dc8f10bb36bbd9dd961e4baba693181add66c962 Mon Sep 17 00:00:00 2001 +From dd587a6b20ccf9e2a7f604d0a6e9e532fdc0b179 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 1125fff020..fc4126f5bb 100644 @@ -23 +24 @@ -@@ -355,6 +355,8 @@ struct roc_nix_rq { +@@ -322,6 +322,8 @@ struct roc_nix_rq { @@ -33 +34 @@ -index e852211ba4..39bd051c94 100644 +index 1cb1fd2101..965ebc7a1f 100644 @@ -36 +37 @@ -@@ -530,7 +530,7 @@ nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, +@@ -333,7 +333,7 @@ nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, @@ -45 +46 @@ -@@ -613,6 +613,7 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf +@@ -417,6 +417,7 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, @@ -53 +54 @@ -@@ -632,6 +633,8 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf +@@ -436,6 +437,8 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, @@ -62 +63 @@ -@@ -680,7 +683,6 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf +@@ -481,7 +484,6 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, @@ -70 +71 @@ -@@ -725,6 +727,7 @@ nix_rq_cn10k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cf +@@ -526,6 +528,7 @@ nix_rq_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints, bool cfg, @@ -78 +79,2 @@ -@@ -950,6 +953,10 @@ roc_nix_rq_init(struct roc_nix *roc_nix, struct roc_nix_rq *rq, bool ena) +@@ -626,6 +629,10 @@ roc_nix_rq_init(struct roc_nix *roc_nix, struct roc_nix_rq *rq, bool ena) + @@ -80 +81,0 @@ - rq->tc = ROC_NIX_PFC_CLASS_INVALID; @@ -88 +89 @@ - else if (roc_model_is_cn10k()) + else