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 6372543C60 for ; Thu, 7 Mar 2024 02:34:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5DB7342EDC; Thu, 7 Mar 2024 02:34:27 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 0699C40E5A for ; Thu, 7 Mar 2024 02:34:26 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-33e383546c1so146897f8f.2 for ; Wed, 06 Mar 2024 17:34:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775265; x=1710380065; 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=9MaoDwo81nPVCZPaqtR3jSFziNvuKvLfU5g0nDLo2aU=; b=SYuudg+Q8wj8LiG8SARpk56YxZxUrFspGiL5Y0EABimma5VVR7enc9yiAef6m0PqEL 0SW87ZbV4bX9z2+BLheZWNemlkfINa0zvM5EvKWkXUqe6PE9QjCW8Q+v7/F+biaoVVL/ juTeubIqv+uIUtvnGowczl4xDUUdOOj5Kst+TQT6NpSdrp6EoMjJ114HVuJPmul1e2gl jMeXNaQQvv0G2Trz3eSJJGvu6G8sfK9ADz7DRpr7/JGO8oYUBwAyS8hHLuQcry//487L JHe/qVtQzqWbrulgs21zz2g59QzfsshgAgdqQLEslXFt61YBTjivME6ItSwdeYoODj4w wsYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775265; x=1710380065; 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=9MaoDwo81nPVCZPaqtR3jSFziNvuKvLfU5g0nDLo2aU=; b=bQnvQtGqKsnqMmEWvn8Wh+D/M9pvZanQz0K4+fMcCPIELJEZpwzD8SZ6avBhqugY0v B3N0gbjrsJGSGAt+uDjXlQYPTUI3qN5NhLBDtBDmY6JQzOeo0LCAJrWLQKShFBRFEIux VpV9R6S2LHIXRSSBq8cEC6Cy+jCUuKaIX2A7eSDNUVc4j/J3S2HLSKnJVXHy6awC3El8 HVWRpEbR/FQ132sCwbXHMOLmx/98IRb9hkodAZVec1bEYFdzZXqtpnjJ5mc0o2g1ep5t UBthEM0Zzy9uiVBqgPaikBd9oQmJunf0iJmrA6ryNsYG988BPS9sz5y+IPigtA1zVHEe mjcg== X-Forwarded-Encrypted: i=1; AJvYcCVHyS9h2LGU1S91pIxPBw/vDg0pv0k7FnPVpGd54XG5tfKss+d7L7jp+FbiJEgRfCg8q5irlKF1bs0HBd796VU= X-Gm-Message-State: AOJu0Yy3LymY/g/xH4WT+n9a+zKfAPcLF1kM8k5v33zzjr7YX9wdBMUQ Ag0l1d72QK9UtsINfxtj6umvDJm9dq+MCmbmQOopV58KZjzG0MDn X-Google-Smtp-Source: AGHT+IF7+hNF7wBSRDOmS+WcSUaMa0moFq8peKIYN7ZJaDVLVHqxFPXT48wPBB1B+PfNZQMxa9i96g== X-Received: by 2002:adf:b610:0:b0:33d:26b1:c460 with SMTP id f16-20020adfb610000000b0033d26b1c460mr12527368wre.39.1709775265636; Wed, 06 Mar 2024 17:34:25 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id bk15-20020a0560001d8f00b0033b48190e5esm19406589wrb.67.2024.03.06.17.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:34:25 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Chengwen Feng , dpdk stable Subject: patch 'dmadev: fix calloc parameters' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:54 +0000 Message-Id: <20240307013159.1735343-37-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/ba907dffe514739b4c97b7c5d842b1d3f1a8aa16 Thanks. Luca Boccassi --- >From ba907dffe514739b4c97b7c5d842b1d3f1a8aa16 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:02 +0000 Subject: [PATCH] dmadev: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 905f8335f916aed1f3119e35332a32119dea4510 ] 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 lib/librte_dmadev.a.p/dmadev_rte_dmadev.c.o ../lib/dmadev/rte_dmadev.c: In function ‘dmadev_handle_dev_dump’: ../lib/dmadev/rte_dmadev.c:1033:29: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1033 | buf = calloc(sizeof(char), RTE_TEL_MAX_SINGLE_STRING_LEN); | ^~~~ Fixes: 94043b04212a ("dmadev: support telemetry dump dmadev") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup Reviewed-by: Chengwen Feng --- lib/dmadev/rte_dmadev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 15076f5f72..b48b915edc 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -1011,7 +1011,7 @@ dmadev_handle_dev_dump(const char *cmd __rte_unused, if (*end_param != '\0') RTE_DMA_LOG(WARNING, "Extra parameters passed to dmadev telemetry command, ignoring"); - buf = calloc(sizeof(char), RTE_TEL_MAX_SINGLE_STRING_LEN); + buf = calloc(RTE_TEL_MAX_SINGLE_STRING_LEN, sizeof(char)); if (buf == NULL) return -ENOMEM; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:38.148266154 +0000 +++ 0037-dmadev-fix-calloc-parameters.patch 2024-03-07 01:05:34.750938997 +0000 @@ -1 +1 @@ -From 905f8335f916aed1f3119e35332a32119dea4510 Mon Sep 17 00:00:00 2001 +From ba907dffe514739b4c97b7c5d842b1d3f1a8aa16 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 905f8335f916aed1f3119e35332a32119dea4510 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 25c92ef8a8..e64b279bac 100644 +index 15076f5f72..b48b915edc 100644 @@ -38 +39 @@ -@@ -1040,7 +1040,7 @@ dmadev_handle_dev_dump(const char *cmd __rte_unused, +@@ -1011,7 +1011,7 @@ dmadev_handle_dev_dump(const char *cmd __rte_unused,