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 B502DA00C2 for ; Thu, 3 Nov 2022 10:31:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B15BA41156; Thu, 3 Nov 2022 10:31:56 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 0C29440693 for ; Thu, 3 Nov 2022 10:31:55 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id g12so1695670wrs.10 for ; Thu, 03 Nov 2022 02:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=5W8IOZuyoE9EBNOMws/V7rmZfqTIl26BZgoKz3k+4P8=; b=aj3U8gxRyg4T2S71nobnzTQOJHKgw+4sLV1/VzPLTgrkFDKtEXU0L11qtPMskOodIH XLblDobXNjFeVIIT6Xn1MdcU9HFIf+vToc+5qHuHkXZhom0P6CIxXAyclPketh1Ca2HD d00f8+IrYAw+LnOcVpaZjQXbGxd4Tq+dpeAFOGxz4QUMPoTuzjnck/qqjSCrieRNol+U NwRqkqUMSinhs6ZJEjfKTyvwl/oC93MnCPT9cBQQ0U/hY6c6QPSqrmrIVVAQ7k0p3I2T RAm3jCKR2lwFungZ3Wlx37hUyIFhK7byTNNHF2kYjUi0pWzjdKrMrd57Cj/PlCnIKLLW Cjuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5W8IOZuyoE9EBNOMws/V7rmZfqTIl26BZgoKz3k+4P8=; b=0UYPl2EGj37CD/LBHXWiAXuta444drlHUeqQex6t+F1BXSDiFXAnwqCyqlkSRWD61o rS7/7tBEDocosgqD7KEotdqth7RoHShtilWNuyDOhDbkNZE9MSfCBW1gNWOoKcwZIiil JUUwM8QgiHnRK/xZEgtN9DNnYQdEmSgvNZsKPqHxnMw7tatwL5ZWEWDThdbQMrLyOv16 aLxEIRtFQHr7RxjTB0mlyADIx5ArDpp/vvSewxnFdjSWFexWIXn6B5jZeaKLpmLV1ywi QY1QrXfFN2xWJPq/OthFShsTeQYveYYAnpP8AWL0EPv7jGvUuOTOK+3CWVK4CZtO1/z2 XjaA== X-Gm-Message-State: ACrzQf3RgfKWkM1cRrHn/X26xqCDmV8SIN9GA+MOsWWHzBX1VmK5WSWT M5f02LrOKY4xAOd9OvBwRHI0Pq/1oRE3Q0as X-Google-Smtp-Source: AMsMyM45FDZ3jTjIzetadIqA2/m7o7taOa4q7QIL73TFudgKW5BPoVXTXRam4cKT654ALyN50LfkKA== X-Received: by 2002:a05:6000:1885:b0:22e:7869:d43f with SMTP id a5-20020a056000188500b0022e7869d43fmr18185227wri.249.1667467914775; Thu, 03 Nov 2022 02:31:54 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id n10-20020a05600c4f8a00b003cf77e6091bsm5118245wmq.11.2022.11.03.02.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Huzaifa Rahman Cc: Joyce Kong , dpdk stable Subject: patch 'net/memif: fix crash with different number of Rx/Tx queues' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:28 +0000 Message-Id: <20221103092758.1099402-70-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/1ec58a78f5873eee1c4c10016db03ec685b2a112 Thanks. Luca Boccassi --- >From 1ec58a78f5873eee1c4c10016db03ec685b2a112 Mon Sep 17 00:00:00 2001 From: Huzaifa Rahman Date: Tue, 26 Jul 2022 15:16:28 +0500 Subject: [PATCH] net/memif: fix crash with different number of Rx/Tx queues [ upstream commit 231435a5e6c7fa915697d8f84a91b44176bba4d1 ] There's a bug in memif_stats_get() function due to confusion between C2S (client->server) and S2C (server->client) rings, causing a crash if there's a different number of Rx and Tx queues. Fixit by selectiing the correct rings for Rx and Tx i.e for Rx, S2C rings are selected and for Tx, C2S rings are selected. Bugzilla ID: 734 Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Signed-off-by: Huzaifa Rahman Reviewed-by: Joyce Kong --- drivers/net/memif/rte_eth_memif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 642c44d4ac..ee5292cc2b 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1396,8 +1396,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->opackets = 0; stats->obytes = 0; - tmp = (pmd->role == MEMIF_ROLE_CLIENT) ? pmd->run.num_c2s_rings : - pmd->run.num_s2c_rings; + tmp = (pmd->role == MEMIF_ROLE_CLIENT) ? pmd->run.num_s2c_rings : + pmd->run.num_c2s_rings; nq = (tmp < RTE_ETHDEV_QUEUE_STAT_CNTRS) ? tmp : RTE_ETHDEV_QUEUE_STAT_CNTRS; @@ -1410,8 +1410,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->ibytes += mq->n_bytes; } - tmp = (pmd->role == MEMIF_ROLE_CLIENT) ? pmd->run.num_s2c_rings : - pmd->run.num_c2s_rings; + tmp = (pmd->role == MEMIF_ROLE_CLIENT) ? pmd->run.num_c2s_rings : + pmd->run.num_s2c_rings; nq = (tmp < RTE_ETHDEV_QUEUE_STAT_CNTRS) ? tmp : RTE_ETHDEV_QUEUE_STAT_CNTRS; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:29.596082470 +0000 +++ 0070-net-memif-fix-crash-with-different-number-of-Rx-Tx-q.patch 2022-11-03 09:27:25.493424764 +0000 @@ -1 +1 @@ -From 231435a5e6c7fa915697d8f84a91b44176bba4d1 Mon Sep 17 00:00:00 2001 +From 1ec58a78f5873eee1c4c10016db03ec685b2a112 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 231435a5e6c7fa915697d8f84a91b44176bba4d1 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index a574bce49e..5b5cae34ea 100644 +index 642c44d4ac..ee5292cc2b 100644 @@ -27 +28 @@ -@@ -1444,8 +1444,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -1396,8 +1396,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) @@ -38 +39 @@ -@@ -1458,8 +1458,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -1410,8 +1410,8 @@ memif_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)