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 AC96C43C60 for ; Thu, 7 Mar 2024 02:34:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5D8042ECF; Thu, 7 Mar 2024 02:34:30 +0100 (CET) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mails.dpdk.org (Postfix) with ESMTP id 24D5C42E64 for ; Thu, 7 Mar 2024 02:34:29 +0100 (CET) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-51381021af1so34580e87.0 for ; Wed, 06 Mar 2024 17:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775268; x=1710380068; 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=5u4glvQmkud5DL0mtHuI7C5RD9x6nkgOBo2zgGgFj7k=; b=OsTUWvq/CDVSiaUZy8TFaTSU3SAyXdKDKi3zjQYQWOrx7kUWZ/6QoeJeUi6V8KdIO4 QWCAdnm+KHvWmQqJHByzeIDCVO6YPiiTkfoXivJZnrInKNGEIxLU1Gt1Y2s0HaUzU2zO TJ6ozqSPZfLGb8vzLhALdM3p47JFksOQ5fu0Bn748ju8Zrnl/4LMZYCc7qsRwzqQl+yt dfeCLnrymDFx0R+u/mGpQK2tPzzWGQjkprAUamXa4SMwV/Y5y8+sCHZLRuiM8KNE5mEl HwcChySL33mDO+V0hOZ20XVy/G/y4uvGUWoY/eig6qqBFg+nq7yrN6TEtR7nYOwbgWbF ZCcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775268; x=1710380068; 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=5u4glvQmkud5DL0mtHuI7C5RD9x6nkgOBo2zgGgFj7k=; b=PCJibBUUBnhsEVJweIa5YQ+KGflbx94q4vizCZfJm+UgG2HRVJuQ+42TyRE/aQm2sc JNKDgNnT7+2/jKcv2J9vyL7N498QgLWECqbj4b1gcm07f3EvzaZpOAMzbAnegnntJt8c 6g2EgIIkomfOQFAL8pChKAz2rT7u7oQ7hQKoDm+XyOE7zEbGIhj/gBuBA+2DsTt7A5IO 8Gs6DGdkS+Ohyj+efMjBsHK5llpfDQP1SMxL188KucLFLa9nr6ib2b7IdX4oMNb1r4wH clKyn4FNA/xIWRxxURs03ryE27sqCsL5L9Mmtfb/KYtXZaU8dP3AYNnstgKLmF0GRgWk MROw== X-Forwarded-Encrypted: i=1; AJvYcCXG8qqsdQpk09QXQLvBXRaFML7ReONKrDmUzdNvnaL+NSFSuaeqI93BKN6qVGZURZYW8/3Xw7UPcx6jCi82Qjo= X-Gm-Message-State: AOJu0YymGs4ukxUWpsmetAkjnJ+Z9de9oim3gLZMGYh2QtEQ/XvBlDlI CisHBRGGmnGKmEL+jdh8uP+mfhyykJC9p+M7EoSKgbq4dqOlqXECpPAc4X+I X-Google-Smtp-Source: AGHT+IFx5unxSmsNnrAkzgBpG+2X6rrhpzDlhJWSBTswGnnNpLcFgO/NInugz0gU3QoGq8hmZuQBeA== X-Received: by 2002:a19:7407:0:b0:512:d5e4:1aa4 with SMTP id v7-20020a197407000000b00512d5e41aa4mr407750lfe.60.1709775268413; Wed, 06 Mar 2024 17:34:28 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id a17-20020a05600c349100b00412f855bc7asm882616wmq.1.2024.03.06.17.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:34:27 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:30:56 +0000 Message-Id: <20240307013159.1735343-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 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/09/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/3dba8ba7977ddfb009263d300cf04c016c81231b Thanks. Luca Boccassi --- >From 3dba8ba7977ddfb009263d300cf04c016c81231b 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 0e1d2434ab..1fdd8b4c80 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -1381,7 +1381,7 @@ 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; rte_mempool_mem_iter(mp, mlx5_range_from_mempool_chunk, *out); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:38.302831799 +0000 +++ 0039-common-mlx5-fix-calloc-parameters.patch 2024-03-07 01:05:34.754939082 +0000 @@ -1 +1 @@ -From f805f70bc5511cd98a34fa2f8f7bd7a3e4cd8aa3 Mon Sep 17 00:00:00 2001 +From 3dba8ba7977ddfb009263d300cf04c016c81231b 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 0e1d2434ab..1fdd8b4c80 100644