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 CD4C743CAD for ; Thu, 14 Mar 2024 01:11:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6DCE42E40; Thu, 14 Mar 2024 01:11:44 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 1D61740297 for ; Thu, 14 Mar 2024 01:11:42 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-413e61525c2so2809505e9.2 for ; Wed, 13 Mar 2024 17:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375102; x=1710979902; 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=bzJ6eo1ac/OtZf76KO6HGO4O0PBI0yctKsuY93pCJp8=; b=JM4wzd4Zr9JMlHfvVRyv0aYMhLWS5KEu7g0q/PEYgUAVzmHySmLlGWgE81ewKDxeq3 xbhGVeM2dEhRl1dToYv/Bjskn+/WCD3orW6+qYPo5LgJdqyBx3F7ygpE7v7bJEh+vvl4 bRH/qkATHZlXj96zUOxJRHx/jbdGIPns3IhbDaCpi1eiB/rK07634AXeST5oM1jA0dwW zbuyLqp1J4lBUZlhZ5S8396YI2vcufO1k0z3XBgzE/vHrpKJxIvVGwJ5EyjZLU2jitTs YqA66UYrMkzPozcmPZotxBWwlhN+zLN0Hi0SbZfaKyuPcLnWzIzMKXaS2re0X+d09ugD 3e2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375102; x=1710979902; 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=bzJ6eo1ac/OtZf76KO6HGO4O0PBI0yctKsuY93pCJp8=; b=mTLjGl94a7ziYJa6FT3PNMB39h6Fq6NZmxazNzPR32iJpDOHHnl1x2u1DKz+ttdzQ2 zTFw8Ok+v8LvtsfgZ1qII8NKVgdpP+j7EXmJLMnLmRYzDO8/hG5YkLGAX1zuYJNFTyWx kKny3BHbvoTPMFVtXuYPYqxM21NA508gVzfDbrkZP5VAKu6wVF7tTbmgxE+l4UpJoy7S MKAzNPrYvcbN7yxhNjdHBqPvbvjZhmsZz1kb1m3IEaXlLchdfA/bZbvLKkcFSyyCsbFL G3FR/OSQww54k7Xyz11l0DNl7Kp7/PnHSNitjzLvBlgV80PB0wcSmUfqrxDPgRibkXdG dDSQ== X-Gm-Message-State: AOJu0YyeLWBxFhJB2QsGtLoeelc6xUEK9KOvCB7R35egKlkZj35w4ewM tQ7Df6DrLjnjB8N/VlFzuEG/aEufQvwNKqVdI6nR07XgC3YIYZa6 X-Google-Smtp-Source: AGHT+IGaGzRF+vke8qfqD3iDCRL07Q2JWZpSGzV91XWqK7c1ym9B1hJxJryk1VS8XkEgQjibjM/XqQ== X-Received: by 2002:a05:600c:4f4a:b0:413:ee9e:fca6 with SMTP id m10-20020a05600c4f4a00b00413ee9efca6mr239476wmq.41.1710375101695; Wed, 13 Mar 2024 17:11:41 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id s9-20020a05600c45c900b00412e3717ae6sm3853671wmo.36.2024.03.13.17.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Bhansali Cc: dpdk stable Subject: patch 'net/cnxk: add cookies check for multi-segment offload' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:28 +0000 Message-Id: <20240314000957.2810803-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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.5 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/16/24. 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/df9a4e91c6f7a2258615ee7801caa0b40a73db73 Thanks. Luca Boccassi --- >From df9a4e91c6f7a2258615ee7801caa0b40a73db73 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Mon, 26 Feb 2024 19:05:33 +0530 Subject: [PATCH] net/cnxk: add cookies check for multi-segment offload [ upstream commit 26a6bda9dfd153192c4cfb73b3367398caa3afaa ] Fix missing check cookies with multi-seg offload case Fixes: 3626d5195d49 ("net/cnxk: add multi-segment Tx for CN10K") Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cn10k_tx.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 84b5faa137..0e7280bd56 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -1387,6 +1387,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, len -= dlen; sg_u = sg_u | ((uint64_t)dlen); + /* Mark mempool object as "put" since it is freed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); + nb_segs = m->nb_segs - 1; m_next = m->next; @@ -1433,6 +1436,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, slist++; } m->next = NULL; + /* Mark mempool object as "put" since it is freed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); + m = m_next; } while (nb_segs); @@ -1469,6 +1475,8 @@ cn10k_nix_prepare_mseg_vec(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0, RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); rte_io_wmb(); #endif + /* Mark mempool object as "put" since it is freed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); return; } @@ -1513,6 +1521,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct rte_mbuf **mbufs, uint64x2_t *cmd0, *data128 |= ((__uint128_t)7) << *shift; *shift += 3; + /* Mark mempool object as "put" since it is freed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(mbufs[0]->pool, (void **)&mbufs[0], 1, 0); + RTE_MEMPOOL_CHECK_COOKIES(mbufs[1]->pool, (void **)&mbufs[1], 1, 0); + RTE_MEMPOOL_CHECK_COOKIES(mbufs[2]->pool, (void **)&mbufs[2], 1, 0); + RTE_MEMPOOL_CHECK_COOKIES(mbufs[3]->pool, (void **)&mbufs[3], 1, 0); return 1; } } @@ -1539,6 +1552,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct rte_mbuf **mbufs, uint64x2_t *cmd0, vst1q_u64(lmt_addr + 10, cmd2[j + 1]); vst1q_u64(lmt_addr + 12, cmd1[j + 1]); vst1q_u64(lmt_addr + 14, cmd3[j + 1]); + + /* Mark mempool object as "put" since it is freed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(mbufs[j]->pool, (void **)&mbufs[j], 1, 0); + RTE_MEMPOOL_CHECK_COOKIES(mbufs[j + 1]->pool, + (void **)&mbufs[j + 1], 1, 0); } else if (flags & NIX_TX_NEED_EXT_HDR) { /* EXT header take 3 each, space for 2 segs.*/ cn10k_nix_prepare_mseg_vec(mbufs[j], -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.184008319 +0000 +++ 0032-net-cnxk-add-cookies-check-for-multi-segment-offload.patch 2024-03-14 00:09:20.617615301 +0000 @@ -1 +1 @@ -From 26a6bda9dfd153192c4cfb73b3367398caa3afaa Mon Sep 17 00:00:00 2001 +From df9a4e91c6f7a2258615ee7801caa0b40a73db73 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26a6bda9dfd153192c4cfb73b3367398caa3afaa ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -13,2 +14,2 @@ - drivers/net/cnxk/cn10k_tx.h | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) + drivers/net/cnxk/cn10k_tx.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) @@ -17 +18 @@ -index 9647f4259e..91b7f15c02 100644 +index 84b5faa137..0e7280bd56 100644 @@ -20 +21 @@ -@@ -1816,6 +1816,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, +@@ -1387,6 +1387,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, @@ -29,2 +30,2 @@ - m->next = NULL; -@@ -1841,6 +1844,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, + +@@ -1433,6 +1436,9 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd, @@ -40,6 +41,4 @@ -@@ -1864,8 +1870,11 @@ cn10k_nix_prepare_mseg_vec(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0, - union nix_send_hdr_w0_u sh; - union nix_send_sg_s sg; - -- if (m->nb_segs == 1) -+ if (m->nb_segs == 1) { +@@ -1469,6 +1475,8 @@ cn10k_nix_prepare_mseg_vec(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0, + RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0); + rte_io_wmb(); + #endif @@ -49 +48 @@ -+ } + } @@ -51,3 +50 @@ - sh.u = vgetq_lane_u64(cmd0[0], 0); - sg.u = vgetq_lane_u64(cmd1[0], 0); -@@ -1925,6 +1934,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct cn10k_eth_txq *txq, +@@ -1513,6 +1521,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct rte_mbuf **mbufs, uint64x2_t *cmd0, @@ -65 +62 @@ -@@ -1943,6 +1957,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct cn10k_eth_txq *txq, +@@ -1539,6 +1552,11 @@ cn10k_nix_prep_lmt_mseg_vector(struct rte_mbuf **mbufs, uint64x2_t *cmd0,