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 0468643C60 for ; Thu, 7 Mar 2024 02:34:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC4C342ECF; Thu, 7 Mar 2024 02:34:32 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 1F0D542E64 for ; Thu, 7 Mar 2024 02:34:30 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33d2b354c72so153918f8f.1 for ; Wed, 06 Mar 2024 17:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775270; x=1710380070; 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=OTKbtqF56xgSWHr42djvfShh3rEwjk3lBI/EeinALdg=; b=adu+GPFJwGayrV0Xqltl7RwKf9X8RH6atCsrIfLHTtepATWnVXpd+vJrWDhlsM6CkH z+1xG5dNEZyrBodmjTLETBLaCZh137Sm7v8tTkzXIs6WLHSGhAe//G/3LpOrY5RTRIto +PBKTrrP65lNGYtlmdgpqKlMujOitYCqsSUUMu71XBHNWKKKsm5yIZhFYKbESW3hJCm/ wVLGIYmTumP6FKDKriWBtbN9ABrLlx6MeozDynZcC8nc/9vHBCDxz+AlrN8Hw8bf4HOh szTgPVpvsJ/dP9hXSclCPJP6EpY4ui0ZhKxRTEOkNnQgiuDJvi9hcRlotenZenvJVKuh fm1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775270; x=1710380070; 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=OTKbtqF56xgSWHr42djvfShh3rEwjk3lBI/EeinALdg=; b=KGDjOhhVFLNLGV/0aG9TJxQlSr87H+TVNud60z+6i5/82wC3cb2HVmPrBkrW3gOW0w 3UdQuus3YebHKZMuM682KsElIqKDAL8ovng9Ac7JrXOGGfkKMPRd89uNKlLrmA8xyaO0 A09u4fmWygcLQBXxxokdjH/lCvN80nixfoxnv5yy8ry5spNrs0vq20w49McBJbeM7S7c tpVIOOFskhuXN2+M0qchtL+rwZvtEpWqzIMQcEKX8VThX78FTfRCtKOJA6IFBD8YUXzv j7Wq+i0U/Mc9F/lOoCK0oed2wnA8XEU3CKGJ/oDn/bDZYH87l2uuWh/dCB+OBpdyQ23G ChYg== X-Forwarded-Encrypted: i=1; AJvYcCWx2JstKUhU07TGjsnDPFgdv0z9rCwZiFfr2mMnK2+rUsOgT4c3tcmQuyTLA23nSoTL+sqKy8SxdFa1W+K4VvI= X-Gm-Message-State: AOJu0Yx1nswzqBeD/ac856KN64zYVcLDQP7ASNzTsM33Hi5/IpVoURng d4Cz6S3cb5YKpFE/GccCZ3diho1gcI5aFunn+Mp12ROE39b+nBmI X-Google-Smtp-Source: AGHT+IHD7QR/SErkYsamtF4T/ayAdHKd2Ge3P2CTaDPD60QBBGmsPBuItiWWU4JJoeO28lJjdExYGg== X-Received: by 2002:a5d:674b:0:b0:33d:82a9:206e with SMTP id l11-20020a5d674b000000b0033d82a9206emr10976091wrw.28.1709775269721; Wed, 06 Mar 2024 17:34:29 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id i6-20020adfb646000000b0033e033898c5sm18876087wre.20.2024.03.06.17.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:34:29 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:30:57 +0000 Message-Id: <20240307013159.1735343-40-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/5cad6d42606102b4ce81d7df133482ed75d5bffc Thanks. Luca Boccassi --- >From 5cad6d42606102b4ce81d7df133482ed75d5bffc 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 @@ -2389,7 +2389,7 @@ int bnx2x_alloc_ilt_mem(struct bnx2x_softc *sc) 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:38.384025109 +0000 +++ 0040-net-bnx2x-fix-calloc-parameters.patch 2024-03-07 01:05:34.774939507 +0000 @@ -1 +1 @@ -From ff0d80191617d3b4435e0f473b129cdc539c23f5 Mon Sep 17 00:00:00 2001 +From 5cad6d42606102b4ce81d7df133482ed75d5bffc 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