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 63E0E45610 for ; Fri, 12 Jul 2024 12:51:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D69542EFC; Fri, 12 Jul 2024 12:51:49 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2071.outbound.protection.outlook.com [40.107.100.71]) by mails.dpdk.org (Postfix) with ESMTP id 61A4F42EFC for ; Fri, 12 Jul 2024 12:51:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kPoQpgdWTf5GnMk4LM023hbpNWUz87muYavPCmDQwxrQIaAn4ZR3QRefXKAtnHd3gHtwxsL5oiaNJV30ZDHp+sHAzXSZsVcsukQbvXh96QU7WHkNKQAEH82G3ok1zs5NoOh3rrGMupBH9hr5X1kzbOKe0trJWueN3T+nidAbdxve4zAUCRwaFRKqGD4KFZn5bdtr49DoF4Hu69MUEgjc4Fd58gKMPMPhrdQWbyJVxxa1xsOYwdHPXBh3d9wMHJZVeMtFlmZeoalpV83QMcgqcwf+Ytqu9SYQ6lRzVUEAhDONQNpd14uYDShsNoe5C+29G9ZkxEp261/jYODR0wS8Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7KnLsXBvRqbJnoUbkkTsmUTZWrKlWQfSSUR1CQtyOAM=; b=rST+LBDA2lpqmAMpC67fe4qDbPm2kUA6V9q0y9HwqfnEQY0ODzx9RsRT0Avfm0snWT8D9gOiJimK5U7p9QH9XGpv+S/11ANIxcZQTJN/xdOxDjSkaqCl95DJovFbipAeKE4xKFKSw4DNwJzbsQ4stTrH16MLni4FtTyepFTTULK+QctFHjcd/JUuj+9d19PNtssfU6Puk4yTrtww6Xz0e01zyeY4P520oRazPDiI3+af4VCtwgd3oNb99Tv5TfOdBpjoWDlWfNkPMI6g79cNyG+379RBz8JA1Z9tmEAkndsMPaI3egHUtpV/iS+zaVlQ3YZxhLJzN+aUUZYXoARvFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7KnLsXBvRqbJnoUbkkTsmUTZWrKlWQfSSUR1CQtyOAM=; b=R1rQQuWeNAK7K7OZC4J3hReXbDe0hkLfX6WxqeGzP6e9ef8j1+kCwsVAvXmqWqjLrwH6zZntdufdAYaT90Rr2d7gpI92iSFHwBKYe8Y9oNzEVnq8mXn+bbenGwHrxC56Pz5UXZxL5crgC8S0RpB/7Ipw3AxY61pLH2+i6E5XCqCiVXKjoHAJF5pugFTgNkmP5bEF8Nirutt8DwbHiigHAT/+ODZZfbXltcxnWTfXuUpKKgDVJzKmFEmNRJdf4SlmBNlG1dMu+UJMHPOZZnzIZdM8sbpcjk5A0XTsNppy2hcPoPjyHUxqDwdB/QeXM1d/5GEGeuDbzwNAyF+eZaL6oA== Received: from PH7PR13CA0012.namprd13.prod.outlook.com (2603:10b6:510:174::18) by DS0PR12MB9273.namprd12.prod.outlook.com (2603:10b6:8:193::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Fri, 12 Jul 2024 10:51:45 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:510:174:cafe::33) by PH7PR13CA0012.outlook.office365.com (2603:10b6:510:174::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22 via Frontend Transport; Fri, 12 Jul 2024 10:51:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001D5.mail.protection.outlook.com (10.167.242.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:51:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:51:30 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:51:28 -0700 From: Xueming Li To: Stephen Hemminger CC: Harry van Haaren , dpdk stable Subject: patch 'event/sw: fix warning from useless snprintf' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:44 +0800 Message-ID: <20240712104528.308638-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D5:EE_|DS0PR12MB9273:EE_ X-MS-Office365-Filtering-Correlation-Id: cca88a0b-8641-4364-03ec-08dca2609f57 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vtJmn2fInqVxPJlWbYRcz40AgPlke+rmWepZNWQ5LSSRL8/1qua/l0iQ19yZ?= =?us-ascii?Q?OgRzea6iFU5yfHs9sl2EJ/+qaC4DvsOGFfb/GPxz7pyMw3ox4lDbyF6xSmL1?= =?us-ascii?Q?F+10CrATaoFdsQQC3wHViHnWJKH9J9rjydDry7eWnrOGKxL4OfMHNUkIoRxk?= =?us-ascii?Q?9H4hINOs0zlIb6opGNeZyCWhNJC4B5FpKN1Gm4osGx+j9/FoUeAmaAjdlZj4?= =?us-ascii?Q?P9Z/TnuEgfNQH5jc3xSA9G+tyJD5PsomSQm10FSn6MR9KsnJ/R1LmG7IJPNI?= =?us-ascii?Q?Z/LvwoWVlZvLI5UZt5ioH8Es+/QUXI/0iIAHtaYpSlBjZ3p9KSBJxdMmcJ6J?= =?us-ascii?Q?TjX07l5dnCnk69iNYXDqbR5bjw0EnLA5d6TKXd0WFpVLbyLzngXGxDXVqG9b?= =?us-ascii?Q?PegHIjFJMgWskQHpjxCcQa2KMPfrxiXpd1QNT6RSNUbKnACiAXKfScZMUe+H?= =?us-ascii?Q?HJBtcAZYql1pAidwF9aTdheXRfmIrFD/gO4OojgUo9c95HABnHwiRRLvWMSO?= =?us-ascii?Q?HVWuPSiVFbYY/oC5/BNvFxj2xXCT9d4PpuipJLFMNaGj+sAjLTa7FIkwuQrQ?= =?us-ascii?Q?z2bZ4riVSTw8U5pz3ZtLvr8DReCpjSKU/lcGyA586wVmpUcC+FjmSMZORkAT?= =?us-ascii?Q?CPjYdOUHPsOLMORbfkYV57peKEeax6WT7oXgAXhdm8UvD7OkIHPNm5Ka7CQ5?= =?us-ascii?Q?QJwAdrXOLI/czi0k4YY8WrZcuVOR1AdhfVw8Tpbz0EVTEN6LRChBBYDnzrTe?= =?us-ascii?Q?nYC8qXH3RQ3EA3K256T+524W5x7U4TB8uyJ+8Q14jRMa/XKDrvlEhK4UJlo/?= =?us-ascii?Q?Y81E3cR+weONscoEgDH9byIfUiAAGT60vL2PXW3bphPZm8f7n2MQxayTWmqr?= =?us-ascii?Q?i/d7zwflxwXGcBU3H1HP5iigTh8eoe1TrMloIwa4iAfytsNUlw5OdA20xnyj?= =?us-ascii?Q?wxJgD6kN/Nk4W5ahpOWhV3etoQKAsXqiGYXRB3EuR1su+4aYOVN8Pz4wKffN?= =?us-ascii?Q?QEjHQcrSvVb4EqMmGMuyyE9fW4zuwAofy+A2dDS4ObGiCZy5iMWtaK8iGsjl?= =?us-ascii?Q?5+LrdW5sCX/TLcu3p7BgumtQ8PUTOfveJveU8JJjJEBEQ0tJdu/h3jwHj+lr?= =?us-ascii?Q?Yp9y470b3IXePcoHzJYRYzhGtQnY39ij0KjxiOrVULBu35a4mX+D1SEX0ArW?= =?us-ascii?Q?NXuRXkWLHWu1RVQvb51rxZhfuIj3f1Vk8nU5r2DadCX9MsoOZVIkcTiA7kNm?= =?us-ascii?Q?TyJr7rohFGQp/lorV7ekQRgoihS13tIpyCCB8PDVt/YLMIve82dwkhmiYvV8?= =?us-ascii?Q?X5WhKQiHplucH7kHgkuLqQjggUEkwRJa2TzpqY9D3Lcs+TUm18r6tU2Qqp/r?= =?us-ascii?Q?Mps3BqT/CKFwImPJwddP9jp+FLJtlbXgeRqypucXflmBp3IBDYxTMkjfJ2Yh?= =?us-ascii?Q?jy74yY4xmeX4kjZ8aQucoIyDVxPcYWnU?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:51:45.3139 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cca88a0b-8641-4364-03ec-08dca2609f57 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9273 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=82ab075745638cc70db6e788e9c4438ac2a0d947 Thanks. Xueming Li --- >From 82ab075745638cc70db6e788e9c4438ac2a0d947 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 23 Apr 2024 20:45:40 -0700 Subject: [PATCH] event/sw: fix warning from useless snprintf Cc: Xueming Li [ upstream commit 510e2b655b46d91d3cc189882e6392afdc0363ff ] With GCC-14, this warning is generated: drivers/event/sw/sw_evdev.c:263:3: warning: snprintf' will always be truncated; specified size is 12, but format string expands to at least 13 snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", dev_id, i); ^ Yet the whole printf to the buf is unnecessary. The type string argument has never been implemented, and should just be NULL. Removing the unnecessary snprintf, then means IQ_ROB_NAMESIZE can be removed. Fixes: 5ffb2f142d95 ("event/sw: support event queues") Signed-off-by: Stephen Hemminger Acked-by: Harry van Haaren --- drivers/event/sw/iq_chunk.h | 2 -- drivers/event/sw/sw_evdev.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/event/sw/iq_chunk.h b/drivers/event/sw/iq_chunk.h index 31d013eab7..7820815c38 100644 --- a/drivers/event/sw/iq_chunk.h +++ b/drivers/event/sw/iq_chunk.h @@ -9,8 +9,6 @@ #include #include -#define IQ_ROB_NAMESIZE 12 - struct sw_queue_chunk { struct rte_event events[SW_EVS_PER_Q_CHUNK]; struct sw_queue_chunk *next; diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c index 55e7735cb0..2096496917 100644 --- a/drivers/event/sw/sw_evdev.c +++ b/drivers/event/sw/sw_evdev.c @@ -228,9 +228,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, const struct rte_event_queue_conf *queue_conf) { unsigned int i; - int dev_id = sw->data->dev_id; int socket_id = sw->data->socket_id; - char buf[IQ_ROB_NAMESIZE]; struct sw_qid *qid = &sw->qids[idx]; /* Initialize the FID structures to no pinning (-1), and zero packets */ @@ -260,8 +258,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type, goto cleanup; } - snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", dev_id, i); - qid->reorder_buffer = rte_zmalloc_socket(buf, + qid->reorder_buffer = rte_zmalloc_socket(NULL, window_size * sizeof(qid->reorder_buffer[0]), 0, socket_id); if (!qid->reorder_buffer) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.835437499 +0800 +++ 0058-event-sw-fix-warning-from-useless-snprintf.patch 2024-07-12 18:40:14.116594226 +0800 @@ -1 +1 @@ -From 510e2b655b46d91d3cc189882e6392afdc0363ff Mon Sep 17 00:00:00 2001 +From 82ab075745638cc70db6e788e9c4438ac2a0d947 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 510e2b655b46d91d3cc189882e6392afdc0363ff ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 7a7a8782e6..e638142dbc 100644 +index 31d013eab7..7820815c38 100644 @@ -37 +39 @@ - struct __rte_cache_aligned sw_queue_chunk { + struct sw_queue_chunk { @@ -41 +43 @@ -index 1c01b069fe..19a52afc7d 100644 +index 55e7735cb0..2096496917 100644