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 5457543829 for ; Tue, 5 Mar 2024 16:35:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D90742D2E; Tue, 5 Mar 2024 16:35:33 +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 9783242686 for ; Tue, 5 Mar 2024 16:35:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652931; 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=dw8v2YLLz6utl5m1iAIiPpJrb4Q0bh/rcmjooYmyQi8=; b=X1PrJ+vBnx2rFOUeR9Xc6jpxIm7FGl2gY6nT0DknroLsFnhyVLgsoygDLdot/VSZsigjWZ JAm6o6EL6YEUNDnbAMcJE/D2zkW7bS/jjt5+MhGX0aS0nO7Vn/sFiUcrLJVr2rD04Uobkc MSZG9pfQT7FOrh74Mb0RMXAYTDPKUwY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-85-0WfybyvqO9-uIOlP17QKkA-1; Tue, 05 Mar 2024 10:35:27 -0500 X-MC-Unique: 0WfybyvqO9-uIOlP17QKkA-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 E78F7101A526; Tue, 5 Mar 2024 15:35:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD33E200AFA5; Tue, 5 Mar 2024 15:35:25 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Dariusz Sosnowski , dpdk stable Subject: patch 'common/mlx5: fix calloc parameters' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:56 +0000 Message-ID: <20240305153449.263666-23-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-Type: text/plain; charset=UTF-8 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 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/bb4eb1f8fc7cdd9207b7f7509c3a869277cc14a2 Thanks. Kevin --- >From bb4eb1f8fc7cdd9207b7f7509c3a869277cc14a2 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:03 +0000 Subject: [PATCH] common/mlx5: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 ] gcc [1] generates warning [2] about calloc usage, because calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.1 20240124 (experimental) [2] Compiling C object .../common_mlx5_mlx5_common_mr.c.o .../mlx5/mlx5_common_mr.c: In function ‘mlx5_mempool_get_chunks’: .../common/mlx5/mlx5_common_mr.c:1384:29: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1384 | *out = calloc(sizeof(**out), n); | ^ Fixes: 7297d2cdecce ("common/mlx5: fix external memory pool registration") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_common_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 7f56e1f973..73a8e3adae 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -1383,5 +1383,5 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out, DRV_LOG(DEBUG, "Collecting chunks of regular mempool %s", mp->name); n = mp->nb_mem_chunks; - *out = calloc(sizeof(**out), n); + *out = calloc(n, sizeof(**out)); if (*out == NULL) return -1; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.249012058 +0000 +++ 0023-common-mlx5-fix-calloc-parameters.patch 2024-03-05 14:08:54.631520715 +0000 @@ -1 +1 @@ -From f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 Mon Sep 17 00:00:00 2001 +From bb4eb1f8fc7cdd9207b7f7509c3a869277cc14a2 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 40ff9153bd..85ec10d2ee 100644 +index 7f56e1f973..73a8e3adae 100644 @@ -38 +39 @@ -@@ -1382,5 +1382,5 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out, +@@ -1383,5 +1383,5 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out,