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 9C0EC43835 for ; Tue, 5 Mar 2024 16:36:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF1A042E80; Tue, 5 Mar 2024 16:36:27 +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 8B6AC42E6E for ; Tue, 5 Mar 2024 16:36:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652986; 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=Az7N6cz+IoHsf/hs88Ku5qnu9jlrOwOz1/rUob/OqAQ=; b=Z6sdaTAokIzyHaLaRHceSGWmpaHiz+eLKvH/l/86iBQH4vCVOIVisoJcFYNMck7B2hLtjX XDxIDDxJ1N3AVhONqVN746N2xYxLPsyBFHQ+u7OHZQiSqxjcuLgunqg/fHBNrIabsMFfR4 LeuoFv8OUWHHhWD/BthxRpdg6yNhbWE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-13-zlChZz1SOv6ALWhgEb-_Aw-1; Tue, 05 Mar 2024 10:36:22 -0500 X-MC-Unique: zlChZz1SOv6ALWhgEb-_Aw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 513BE28C97CA; Tue, 5 Mar 2024 15:36:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97A7A200AE7F; Tue, 5 Mar 2024 15:36:21 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix stats query crash in secondary process' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:42 +0000 Message-ID: <20240305153449.263666-69-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.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 03/11/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/40625500ace1a348152f2894016a88feae6e9c6c Thanks. Kevin --- >From 40625500ace1a348152f2894016a88feae6e9c6c Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Mon, 22 Jan 2024 09:44:05 +0200 Subject: [PATCH] net/mlx5: fix stats query crash in secondary process [ upstream commit d312cab568ecdc8411cb3dc896e7d5020836399b ] The "outer_of_buffer" counter is owned by the primary process devx object and it is pointer by pointer in mlx5_priv structure. Actually, there are 4 levels' pointers in this piece of code. The secondary process can't access this part directly since it belongs to another process's heap. Return ENOTSUP as a workaround. Fixes: 750e48c7d8c3 ("common/mlx5: add DevX commands for queue counters") Signed-off-by: Rongwei Liu Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 85eda47f7d..1e1de4b547 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2896,7 +2896,13 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char *ctr_name, if (priv->sh) { if (priv->q_counters != NULL && - strcmp(ctr_name, "out_of_buffer") == 0) + strcmp(ctr_name, "out_of_buffer") == 0) { + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + DRV_LOG(WARNING, "Devx out_of_buffer counter is not supported in the secondary process"); + rte_errno = ENOTSUP; + return 1; + } return mlx5_devx_cmd_queue_counter_query (priv->q_counters, 0, (uint32_t *)stat); + } MKSTR(path, "%s/ports/%d/hw_counters/%s", priv->sh->ibdev_path, -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.293710546 +0000 +++ 0069-net-mlx5-fix-stats-query-crash-in-secondary-process.patch 2024-03-05 14:08:54.755521043 +0000 @@ -1 +1 @@ -From d312cab568ecdc8411cb3dc896e7d5020836399b Mon Sep 17 00:00:00 2001 +From 40625500ace1a348152f2894016a88feae6e9c6c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d312cab568ecdc8411cb3dc896e7d5020836399b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index cc8e1919e8..f10e623953 100644 +index 85eda47f7d..1e1de4b547 100644 @@ -28 +29 @@ -@@ -2999,7 +2999,13 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char *ctr_name, +@@ -2896,7 +2896,13 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char *ctr_name,