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 78CF443829 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 72DB142DF2; 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.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E6FD542D2E 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=V8RK4VO5zCWBp2TYnOwLy/Ge6OzJiCPVPwQneWGfJKI=; b=QIO+zBX1AFefMkuzslwzFnOhyEJvvIYwh0dn3t87WuykZY/9l+59sEXH3eZsRqmQbafZEn W11Fwg5dxgG8EChR07uPXRyMddXRxpu8ui/oVbzhy/IFqHJm8D8aK/oLQrSby325x4gBYD lKxsE2ee4651ScVuLtcDGHSBFZNEFOY= 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-196-adnUBJB0PjudGK68_L8uzQ-1; Tue, 05 Mar 2024 10:35:28 -0500 X-MC-Unique: adnUBJB0PjudGK68_L8uzQ-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 3016E29AA393; Tue, 5 Mar 2024 15:35:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53CB0200AFA2; Tue, 5 Mar 2024 15:35:27 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/bnx2x: fix calloc parameters' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:57 +0000 Message-ID: <20240305153449.263666-24-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/59160624f8f007a1c301493257a61bfc7177d1a1 Thanks. Kevin --- >From 59160624f8f007a1c301493257a61bfc7177d1a1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 24 Jan 2024 18:54:04 +0000 Subject: [PATCH] net/bnx2x: fix calloc parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit ff0d80191617d3b4435e0f473b129cdc539c23f5 ] gcc [1] generates warning [2] about rte_calloc usage, because rte_calloc parameter order is wrong, fixing it by replacing parameters. [1] gcc (GCC) 14.0.1 20240124 (experimental) [2] Compiling C object drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x.c.o ../drivers/net/bnx2x/bnx2x.c: In function ‘bnx2x_alloc_ilt_lines_mem’: ../drivers/net/bnx2x/bnx2x.c:2392:44: warning: ‘rte_calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 2392 | sizeof(struct ilt_line), ILT_MAX_LINES, | ^~~~~~ Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup --- drivers/net/bnx2x/bnx2x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 74e3018eab..55a91fad78 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -2390,5 +2390,5 @@ static int bnx2x_alloc_ilt_lines_mem(struct bnx2x_softc *sc) { sc->ilt->lines = rte_calloc("", - sizeof(struct ilt_line), ILT_MAX_LINES, + ILT_MAX_LINES, sizeof(struct ilt_line), RTE_CACHE_LINE_SIZE); return sc->ilt->lines == NULL; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.270505601 +0000 +++ 0024-net-bnx2x-fix-calloc-parameters.patch 2024-03-05 14:08:54.639520736 +0000 @@ -1 +1 @@ -From ff0d80191617d3b4435e0f473b129cdc539c23f5 Mon Sep 17 00:00:00 2001 +From 59160624f8f007a1c301493257a61bfc7177d1a1 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit ff0d80191617d3b4435e0f473b129cdc539c23f5 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index c3283c94f3..597ee43359 100644 +index 74e3018eab..55a91fad78 100644