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 B06174719B for ; Tue, 6 Jan 2026 10:44:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D20A4026F; Tue, 6 Jan 2026 10:44:58 +0100 (CET) Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011051.outbound.protection.outlook.com [40.107.208.51]) by mails.dpdk.org (Postfix) with ESMTP id 889B24026F for ; Tue, 6 Jan 2026 10:44:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vdF4qD24EO10nf02QJgrntrr5ae0sFHj6tmTaWOqpTaWf9NrZxxidUVGkYS+LNkt8SzA0ectiEcjhryz+uvvKeraR0D22tqhBN98PJqCnpTb97vTkZYoCunxS3YfOfUrbnJdjOGQzBNI70CbPVU0yf4Z+I40xm470IsQG+uksKr8Cb7PY+RjkGpHg2Av/CpHyCZFYzQdreb02r33O+JKtkzsGH5+LsVuYi2eWD0VnqOUZYvP9vutFzuhYgoTFCfxaUEymOjJZCqMm5SY1d1mjYPeKApYsk3RppBHPDimBw6fhnLkU4aLM3uK9GwIF050EKDmlMUE2HUMlaXXJ9eIJg== 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=rCtPDGQsbyO9tOD44pPEREpHkdMzWZ1siJqfnkaIFVg=; b=O3TSypPbvLvYUPUUF/w3b497zfh/wtgRBNFcUzmsOWlqJj9Gl8DepGCn4zVfkTExSHW3ZOezYTW/h1CoN566OrL0gee9M0F6arsRazHPWuuqphmGyiD+iDtnazo8yoJVAmHPgtphH/TSwMrdfNT2S9myU9qNNsSz9OQgRFGvu2K0FD3suQ7EYZqxVwzw/c0dUpWH4UxOiJTNlCXYtG/bUl8CzvGxIdhUMjmvQ35ILfEmF7ChEjeiwX0jTXQ+FswcArwmEp+qNWUvukkh6eGkNK4jSW6iV+uygg9GXCE19XmoB32IqlJssaL8q/UqPf3bmmU0fyhgUuk3RjXGkfjrhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com 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=rCtPDGQsbyO9tOD44pPEREpHkdMzWZ1siJqfnkaIFVg=; b=bfmX+loGrwUj5dk3MJcn+H+1eHWFK5H+Z/FV3/M/XfVQbrU1cQ2QkxFcNSgoY/O4r/7MOA9I758phcAgXBAPlURYaEGZRB5l3uZC3Kpx8KAeHiKHlXIvmuTNPNSisOOpSpprKopjtqoVSNLkB0TNNLc6IJ02A097sF9NbaakZwGX3CZZGMr8fZnW6d2CuJs5KClMNj7F5ZNGntKEukAyBT+VnDrMt/3TNzvxYFDlMAg7S48+UZAOVVv9QcsKjP3/+IwSp5wBNrH7ajCmyC1Lvujyll+2H3DhxouWVgR0cfqKBnAkXsN1eumtRK/P2IZ9MbR00nGRRBWO5Uapqb4Cqw== Received: from BYAPR05CA0097.namprd05.prod.outlook.com (2603:10b6:a03:e0::38) by SA3PR12MB7860.namprd12.prod.outlook.com (2603:10b6:806:307::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9478.4; Tue, 6 Jan 2026 09:44:45 +0000 Received: from SJ1PEPF00002320.namprd03.prod.outlook.com (2603:10b6:a03:e0:cafe::68) by BYAPR05CA0097.outlook.office365.com (2603:10b6:a03:e0::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9499.1 via Frontend Transport; Tue, 6 Jan 2026 09:44:49 +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 SJ1PEPF00002320.mail.protection.outlook.com (10.167.242.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9499.1 via Frontend Transport; Tue, 6 Jan 2026 09:44: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.2562.20; Tue, 6 Jan 2026 01:44:33 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.2562.20; Tue, 6 Jan 2026 01:44:32 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Tue, 6 Jan 2026 01:44:30 -0800 From: Shani Peretz To: Ferruh Yigit CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Bruce Richardson" , Andrew Rybchenko , Dariusz Sosnowski , dpdk stable Subject: patch 'ethdev: convert string initialization' has been queued to stable release 23.11.6 Date: Tue, 6 Jan 2026 11:44:21 +0200 Message-ID: <20260106094422.3389-1-shperetz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251225091938.345892-100-shperetz@nvidia.com> References: <20251225091938.345892-100-shperetz@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002320:EE_|SA3PR12MB7860:EE_ X-MS-Office365-Filtering-Correlation-Id: 28526570-6ea4-4d5b-4070-08de4d08396b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|13003099007|7053199007|7142099003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Nk5VczgyZVF1bzdWeGFuRHVDd3l6V0hHWEY4ZmQ2TE5XNHBpR2VZTzNKZ3J5?= =?utf-8?B?aHljQmJBbk42SWdveEdaSEJHUHg0eFBCVGhHMWQzTXhmLytGWUpLR2cvd2cy?= =?utf-8?B?Yk9PSzZIcVd5amhZd1RHQ3h6VERYVERPYVROb1JkaUFzOHp4L2swZkZTdFZk?= =?utf-8?B?OCtiNmZuYWZPMEVvL3duVVQ0aEhsaUJVZ3o3VldiaGpDWVhHdVY3N2pLZm5X?= =?utf-8?B?YmorL2lCRm1VcHF1cVF5OW4yd0RySklTQTF4QWJKZUZoYmhMQlR2dXlBWUVN?= =?utf-8?B?VXFvcEpzdW5Ld0pHRW1mWWlZeFV2M3RtY2g1V0NTQ0preTY0cFpxaFBmZi81?= =?utf-8?B?RUpGeGxtZ3lhdEZHVWYzSmV0b3VaQ1UxWWo1TVQ5dzQyY3hXTjFHVzlIc1BZ?= =?utf-8?B?MzNyUmVLTjlnb3ZrUjQ5Rm1sQWpxWjk0WjBNZFFiaCtObG1NOXdnUzRhL1hv?= =?utf-8?B?NEQ5T0lrbTYxODM3ZXdneG5rU0FTNVJQb3pKamVVODZoelBsQVRuenFkTVpE?= =?utf-8?B?U2JRUTVKakwzTEpHb0RtVnBKT3BIN2Y0TEZwdWZPc2Job1dSRVd2RzlTNEZo?= =?utf-8?B?SVJNTlg1cjJxZmYxM2VBVk4rcm1RZDJGKzlJQTQydjdMVmZCdjRqNXVOUWND?= =?utf-8?B?NlJONDI2SDRrZnNwanloUlB2VzRXMXlHcCtITHMzK3YxbUkyUWdaV2NSb3Qz?= =?utf-8?B?L2ZFMGdycytwOXFjYW13VDc5L3dOeTJRdmMraDBnOUdwaXA3bmFjeXZjdGU3?= =?utf-8?B?dnBHUVd3Z043NUpxd1lOclBJT0I1YnJ4Yi9QYU5rckNSMk40bFZ0WURqTitG?= =?utf-8?B?R0F3K3ZsanJLRVNZTVlWSVhzbjBnaCttSmVONjdNTjZNNHRjcmEySG5UeUFa?= =?utf-8?B?Z1cyZ0lhMkpoSFd1NGFFdUFMTXYwcjFJaWRJcXBxMWkvdXA0YnRFZGV0OTZ1?= =?utf-8?B?RDRwNHZISGZSMS9Pc2IwUDR3TUxtak8yOGVmTiszcFMzanhNUXlydnlkMUZ3?= =?utf-8?B?RHY1Q2FEckY1WnpSS1grZTJVZ3ZDa0lBcFo0SWhVcmFzZFRYaTloOFNXakNP?= =?utf-8?B?bFVpczBGS01zODZ6ZEVKZ1AxWDJ4Y3A3SWU3L3dsbEdTN0dZemVPQUUyME1X?= =?utf-8?B?aCtMRytLcHVuZ1F6QjRMVWo1b0t5NWVwVTJNdE9lNHM3WkdjZkVlZTZjT1J1?= =?utf-8?B?dU1qb2I5aDFhcjA3SnBqRHV3eDBrTUJpL1BMYkRBdnVHOUdOcDN6V3NOOUJm?= =?utf-8?B?dEFrdDJvZnNxdzBpZlRsVUIrcXJUR1V5bEdrc2g4Qm1JYkNKbWFKT01EWnVQ?= =?utf-8?B?NERsa3AwZmVGYzZyaElZaXVNcFpRMFNURkFHSDNEYjVrMnNnTVpSMXR2ZGJp?= =?utf-8?B?M1I5QkdKOU1wbnh5ZkR1UXRnWS9uNEJ5Y3lWRGVxaXU5NEkzWDFzN0RtS2FG?= =?utf-8?B?N0l0LzVhcGQyMmtIVDg3dzZJbHJvMnF0MXAraThZT1V0ZnlSbWN2UWFZbXQ5?= =?utf-8?B?ZEEwRXVaS1R6dmp0aCtZS3VObStJejJuMjFMZWxMUVl5SnNhUWNDUDR1TkxU?= =?utf-8?B?TXNacTY3YVpma3V3Q2c1NGxPallSY0RBUFFQQ1RvakN4ZnUyOSt5bWNtSlUy?= =?utf-8?B?M0VwRlpBVTJCd2s3VmtOYThLNzgxYXB6c3oyYjhuaDZCRWIzZnVWNVhSZnNV?= =?utf-8?B?QjRBMUlSL2lLM1FrUndMUEtDeUQ2OWlteWlBNG1tejk0eUhwUzJycy83ckc0?= =?utf-8?B?MVh2dEZUMGFlZnVNMTZ4b0VQanhldGp4TDRGdkZVZmhsUDBCUzhtQjlLWC9o?= =?utf-8?B?bFR2RnRWRTZBRFUyanhQQnJqT1ZZY3ZDUzFHRm01NVNLLzkrWEJnOGZZaHpl?= =?utf-8?B?Ui9tZVgraEJqU0ZUakQzWUs2em9YRVkrUW1rdXNtMFRuWVNtTHczQXNuVnpD?= =?utf-8?B?bEMvWG9YWCtmcWpYSkNLS0FLR29KRWFCOHFXbWg0blhWaTZaTVdPcnMzbW8w?= =?utf-8?B?VEFNMHZGVFh2djIwbGRoQmthOVNJTnpsRHh6QXhTMUdaaGhSR2kyVFVIYnk4?= =?utf-8?B?citFbzZkYm9rWDN2djFlT1o0TjNCOWJBWG5yTFVkaWd4QldSTWxiZjJaTmxW?= =?utf-8?Q?1FIcLQuC8U78kb0EyoVRMKavn?= 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)(1800799024)(82310400026)(36860700013)(13003099007)(7053199007)(7142099003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2026 09:44:45.1146 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28526570-6ea4-4d5b-4070-08de4d08396b 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: SJ1PEPF00002320.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7860 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/26. 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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/87493569dfe5a75bc67aac91b55ceee5de45ca82 Thanks. Shani --- >From 87493569dfe5a75bc67aac91b55ceee5de45ca82 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 3 Oct 2024 21:13:34 -0700 Subject: [PATCH] ethdev: convert string initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit e0d947a1e6c2f80 ] gcc 15 experimental [1], with -Wextra flag, gives warning in variable initialization as string [2]. The warning has a point when initialized variable is intended to use as string, since assignment is missing the required null terminator for this case. But warning is useless for our usecase. In this patch only updated a few instance to show the issue, there are many instances to fix, if we prefer to go this way. Other option is to disable warning but it can be useful for actual string usecases, so I prefer to keep it. Converted string initialization to array initialization. [1] gcc (GCC) 15.0.0 20241003 (experimental) [2] ../lib/ethdev/rte_flow.h:906:36: error: initializer-string for array of ‘unsigned char’ is too long [-Werror=unterminated-string-initialization] 906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ../lib/ethdev/rte_flow.h:907:36: error: initializer-string for array of ‘unsigned char’ is too long [-Werror=unterminated-string-initialization] 907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ../lib/ethdev/rte_flow.h:1009:25: error: initializer-string for array of ‘unsigned char’ is too long [-Werror=unterminated-string-initialization] 1009 | "\xff\xff\xff\xff\xff\xff\xff\xff" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../lib/ethdev/rte_flow.h:1012:25: error: initializer-string for array of ‘unsigned char’ is too long [-Werror=unterminated-string-initialization] 1012 | "\xff\xff\xff\xff\xff\xff\xff\xff" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../lib/ethdev/rte_flow.h:1135:20: error: initializer-string for array of ‘unsigned char’ is too long [-Werror=unterminated-string-initialization] 1135 | .hdr.vni = "\xff\xff\xff", | ^~~~~~~~~~~~~~ Signed-off-by: Ferruh Yigit Acked-by: Morten Brørup Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko Acked-by: Dariusz Sosnowski --- app/test-pmd/cmdline_flow.c | 31 +++++++++-------- app/test/test_bpf.c | 2 +- app/test/test_pcapng.c | 2 +- app/test/test_security_inline_macsec.c | 4 +-- doc/guides/prog_guide/rte_flow.rst | 2 +- drivers/net/cxgbe/cxgbe_flow.c | 14 ++++---- drivers/net/dpaa2/dpaa2_flow.c | 14 ++++---- drivers/net/mlx4/mlx4_flow.c | 6 ++-- drivers/net/mlx5/mlx5_flow.c | 20 +++++------ drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++------- drivers/net/mlx5/mlx5_flow_hw.c | 48 +++++++++++++------------- drivers/net/mlx5/mlx5_trigger.c | 20 +++++------ drivers/net/nfp/nfp_flow.c | 14 ++++---- drivers/net/tap/tap_flow.c | 30 +++++++--------- examples/l2fwd-macsec/main.c | 4 +-- 15 files changed, 112 insertions(+), 123 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 661c72c7ef..4998c2cd2d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -833,20 +833,20 @@ struct vxlan_encap_conf vxlan_encap_conf = { .select_ipv4 = 1, .select_vlan = 0, .select_tos_ttl = 0, - .vni = "\x00\x00\x00", + .vni = { 0x00, 0x00, 0x00 }, .udp_src = 0, .udp_dst = RTE_BE16(RTE_VXLAN_DEFAULT_PORT), .ipv4_src = RTE_IPV4(127, 0, 0, 1), .ipv4_dst = RTE_IPV4(255, 255, 255, 255), - .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x00\x01", - .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x11\x11", + .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }, + .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 }, .vlan_tci = 0, .ip_tos = 0, .ip_ttl = 255, - .eth_src = "\x00\x00\x00\x00\x00\x00", - .eth_dst = "\xff\xff\xff\xff\xff\xff", + .eth_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .eth_dst = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }; /** Maximum number of items in struct rte_flow_action_vxlan_encap. */ @@ -869,16 +869,16 @@ struct action_vxlan_encap_data { struct nvgre_encap_conf nvgre_encap_conf = { .select_ipv4 = 1, .select_vlan = 0, - .tni = "\x00\x00\x00", + .tni = { 0x00, 0x00, 0x00 }, .ipv4_src = RTE_IPV4(127, 0, 0, 1), .ipv4_dst = RTE_IPV4(255, 255, 255, 255), - .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x00\x01", - .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x11\x11", + .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }, + .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 }, .vlan_tci = 0, - .eth_src = "\x00\x00\x00\x00\x00\x00", - .eth_dst = "\xff\xff\xff\xff\xff\xff", + .eth_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .eth_dst = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }; /** Maximum number of items in struct rte_flow_action_nvgre_encap. */ @@ -7676,7 +7676,8 @@ parse_prefix(struct context *ctx, const struct token *token, void *buf, unsigned int size) { const struct arg *arg = pop_args(ctx); - static const uint8_t conv[] = "\x00\x80\xc0\xe0\xf0\xf8\xfc\xfe\xff"; + static const uint8_t conv[] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, + 0xf8, 0xfc, 0xfe, 0xff }; char *end; uintmax_t u; unsigned int bytes; diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index f83e72a9ad..1b89b3fd5d 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -3346,7 +3346,7 @@ test_bpf_filter_sanity(pcap_t *pcap) hdr = rte_pktmbuf_mtod(m, typeof(hdr)); hdr->eth_hdr = (struct rte_ether_hdr) { - .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), }; hdr->ip_hdr = (struct rte_ipv4_hdr) { diff --git a/app/test/test_pcapng.c b/app/test/test_pcapng.c index 5cdde0542a..75ff461e8a 100644 --- a/app/test/test_pcapng.c +++ b/app/test/test_pcapng.c @@ -73,7 +73,7 @@ mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen) struct rte_udp_hdr udp; } pkt = { .eth = { - .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), }, .ip = { diff --git a/app/test/test_security_inline_macsec.c b/app/test/test_security_inline_macsec.c index f11e9da8c3..c921bf8ebb 100644 --- a/app/test/test_security_inline_macsec.c +++ b/app/test/test_security_inline_macsec.c @@ -318,8 +318,8 @@ create_default_flow(const struct mcs_test_vector *td, uint16_t portid, struct rte_flow *flow; struct rte_flow_item_eth eth = { .hdr.ether_type = 0, }; static const struct rte_flow_item_eth eth_mask = { - .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = RTE_BE16(0x0000), }; diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 627b845bfb..7453ce6d0e 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -3836,7 +3836,7 @@ For example, to create a pattern template to match on the destination MAC: const struct rte_flow_pattern_template_attr attr = {.ingress = 1}; struct rte_flow_item_eth eth_m = { - .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff"; + .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; }; struct rte_flow_item pattern[] = { [0] = {.type = RTE_FLOW_ITEM_TYPE_ETH, diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index f5787c247f..40d21e6944 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -889,8 +889,8 @@ static struct chrte_fparse parseitem[] = { [RTE_FLOW_ITEM_TYPE_ETH] = { .fptr = ch_rte_parsetype_eth, .dmask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0xffff, } }, @@ -918,12 +918,10 @@ static struct chrte_fparse parseitem[] = { .fptr = ch_rte_parsetype_ipv6, .dmask = &(const struct rte_flow_item_ipv6) { .hdr = { - .src_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - .dst_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .vtc_flow = RTE_BE32(0xff000000), }, }, diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c index e590f6f748..4b6697552f 100644 --- a/drivers/net/dpaa2/dpaa2_flow.c +++ b/drivers/net/dpaa2/dpaa2_flow.c @@ -100,8 +100,8 @@ enum rte_flow_action_type dpaa2_supported_fs_action_type[] = { #ifndef __cplusplus static const struct rte_flow_item_eth dpaa2_flow_item_eth_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .hdr.ether_type = RTE_BE16(0xffff), }; @@ -117,12 +117,10 @@ static const struct rte_flow_item_ipv4 dpaa2_flow_item_ipv4_mask = { static const struct rte_flow_item_ipv6 dpaa2_flow_item_ipv6_mask = { .hdr = { - .src_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - .dst_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .proto = 0xff }, }; diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index 8ef9fd2db4..b520664d95 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -582,7 +582,7 @@ static const struct mlx4_flow_proc_item mlx4_flow_proc_item_list[] = { RTE_FLOW_ITEM_TYPE_IPV4), .mask_support = &(const struct rte_flow_item_eth){ /* Only destination MAC can be matched. */ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }, .mask_default = &rte_flow_item_eth_mask, .mask_sz = sizeof(struct rte_flow_item_eth), @@ -1304,10 +1304,10 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error) }; struct rte_flow_item_eth eth_spec; const struct rte_flow_item_eth eth_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }; const struct rte_flow_item_eth eth_allmulti = { - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; struct rte_flow_item_vlan vlan_spec; const struct rte_flow_item_vlan vlan_mask = { diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 239ea2be03..e955e41ee1 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2742,8 +2742,8 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item, { const struct rte_flow_item_eth *mask = item->mask; const struct rte_flow_item_eth nic_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .hdr.ether_type = RTE_BE16(0xffff), .has_vlan = ext_vlan_sup ? 1 : 0, }; @@ -3005,12 +3005,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item, const struct rte_flow_item_ipv6 *spec = item->spec; const struct rte_flow_item_ipv6 nic_mask = { .hdr = { - .src_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - .dst_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .vtc_flow = RTE_BE32(0xffffffff), .proto = 0xff, }, @@ -3230,7 +3228,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev, uint8_t vni[4]; } id = { .vlan_id = 0, }; const struct rte_flow_item_vxlan nic_mask = { - .hdr.vni = "\xff\xff\xff", + .hdr.vni = { 0xff, 0xff, 0xff }, .hdr.rsvd1 = 0xff, }; const struct rte_flow_item_vxlan *valid_mask; @@ -3313,7 +3311,7 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, } id = { .vlan_id = 0, }; struct rte_flow_item_vxlan_gpe nic_mask = { - .vni = "\xff\xff\xff", + .vni = { 0xff, 0xff, 0xff }, .protocol = 0xff, }; @@ -3611,7 +3609,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item, MLX5_GENEVE_OPT_LEN_1 : MLX5_GENEVE_OPT_LEN_0; const struct rte_flow_item_geneve nic_mask = { .ver_opt_len_o_c_rsvd0 = RTE_BE16(0x3f80), - .vni = "\xff\xff\xff", + .vni = { 0xff, 0xff, 0xff }, .protocol = RTE_BE16(UINT16_MAX), }; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index d42b95ce0c..2be9ddf186 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7431,11 +7431,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, const struct rte_flow_item_ipv6 nic_ipv6_mask = { .hdr = { .src_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .dst_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .vtc_flow = RTE_BE32(0xffffffff), .proto = 0xff, .hop_limits = 0xff, @@ -8951,8 +8951,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item, const struct rte_flow_item_eth *eth_m; const struct rte_flow_item_eth *eth_v; const struct rte_flow_item_eth nic_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .hdr.ether_type = RTE_BE16(0xffff), .has_vlan = 0, }; @@ -9209,12 +9209,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item, const struct rte_flow_item_ipv6 *ipv6_v; const struct rte_flow_item_ipv6 nic_mask = { .hdr = { - .src_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - .dst_addr = - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .vtc_flow = RTE_BE32(0xffffffff), .proto = 0xff, .hop_limits = 0xff, @@ -9734,7 +9732,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, int i; struct mlx5_priv *priv = dev->data->dev_private; const struct rte_flow_item_vxlan nic_mask = { - .hdr.vni = "\xff\xff\xff", + .hdr.vni = { 0xff, 0xff, 0xff }, .hdr.rsvd1 = 0xff, }; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index d17b4d560e..0e133ede15 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -235,67 +235,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX] /* Ethernet item spec for promiscuous mode. */ static const struct rte_flow_item_eth ctrl_rx_eth_promisc_spec = { - .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item mask for promiscuous mode. */ static const struct rte_flow_item_eth ctrl_rx_eth_promisc_mask = { - .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item spec for all multicast mode. */ static const struct rte_flow_item_eth ctrl_rx_eth_mcast_spec = { - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item mask for all multicast mode. */ static const struct rte_flow_item_eth ctrl_rx_eth_mcast_mask = { - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item spec for IPv4 multicast traffic. */ static const struct rte_flow_item_eth ctrl_rx_eth_ipv4_mcast_spec = { - .hdr.dst_addr.addr_bytes = "\x01\x00\x5e\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item mask for IPv4 multicast traffic. */ static const struct rte_flow_item_eth ctrl_rx_eth_ipv4_mcast_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item spec for IPv6 multicast traffic. */ static const struct rte_flow_item_eth ctrl_rx_eth_ipv6_mcast_spec = { - .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item mask for IPv6 multicast traffic. */ static const struct rte_flow_item_eth ctrl_rx_eth_ipv6_mcast_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item mask for unicast traffic. */ static const struct rte_flow_item_eth ctrl_rx_eth_dmac_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; /* Ethernet item spec for broadcast. */ static const struct rte_flow_item_eth ctrl_rx_eth_bcast_spec = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; @@ -7966,8 +7966,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow .ingress = 1, }; struct rte_flow_item_eth lacp_mask = { - .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .src.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .type = 0xFFFF, }; struct rte_flow_item eth_all[] = { @@ -12726,7 +12726,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev, .type = MLX5_HW_CTRL_FLOW_TYPE_DEFAULT_RX_RSS, }; const struct rte_ether_addr cmp = { - .addr_bytes = "\x00\x00\x00\x00\x00\x00", + .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; unsigned int i; @@ -12772,7 +12772,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev, .type = MLX5_HW_CTRL_FLOW_TYPE_DEFAULT_RX_RSS, }; const struct rte_ether_addr cmp = { - .addr_bytes = "\x00\x00\x00\x00\x00\x00", + .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; unsigned int i; unsigned int j; diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 47c80ebd3c..d2af029311 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1587,23 +1587,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) { struct mlx5_priv *priv = dev->data->dev_private; struct rte_flow_item_eth bcast = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }; struct rte_flow_item_eth ipv6_multi_spec = { - .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 }, }; struct rte_flow_item_eth ipv6_multi_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }, }; struct rte_flow_item_eth unicast = { - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; struct rte_flow_item_eth unicast_mask = { - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }; const unsigned int vlan_filter_n = priv->vlan_filter_n; const struct rte_ether_addr cmp = { - .addr_bytes = "\x00\x00\x00\x00\x00\x00", + .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; unsigned int i; unsigned int j; @@ -1672,8 +1672,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) return 0; if (dev->data->promiscuous) { struct rte_flow_item_eth promisc = { - .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; @@ -1683,8 +1683,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) } if (dev->data->all_multicast) { struct rte_flow_item_eth multicast = { - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = 0, }; diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 13f58b210e..a5aacae855 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -1804,8 +1804,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { RTE_FLOW_ITEM_TYPE_IPV6), .mask_support = &(const struct rte_flow_item_eth) { .hdr = { - .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .ether_type = RTE_BE16(0xffff), }, .has_vlan = 1, @@ -1857,10 +1857,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { .vtc_flow = RTE_BE32(0x0ff00000), .proto = 0xff, .hop_limits = 0xff, - .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }, .has_frag_ext = 1, }, @@ -1918,7 +1918,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_GENEVE] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), .mask_support = &(const struct rte_flow_item_geneve) { - .vni = "\xff\xff\xff", + .vni = { 0xff, 0xff, 0xff }, }, .mask_default = &rte_flow_item_geneve_mask, .mask_sz = sizeof(struct rte_flow_item_geneve), diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c index b32ad7eaa5..9a9233b882 100644 --- a/drivers/net/tap/tap_flow.c +++ b/drivers/net/tap/tap_flow.c @@ -259,8 +259,8 @@ static const struct tap_flow_items tap_flow_items[] = { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_IPV6), .mask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .hdr.ether_type = -1, }, .mask_sz = sizeof(struct rte_flow_item_eth), @@ -302,14 +302,10 @@ static const struct tap_flow_items tap_flow_items[] = { RTE_FLOW_ITEM_TYPE_TCP), .mask = &(const struct rte_flow_item_ipv6){ .hdr = { - .src_addr = { - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - }, - .dst_addr = { - "\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff", - }, + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .proto = -1, }, }, @@ -392,7 +388,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { .items[0] = { .type = RTE_FLOW_ITEM_TYPE_ETH, .mask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }, }, .items[1] = { @@ -409,10 +405,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { .items[0] = { .type = RTE_FLOW_ITEM_TYPE_ETH, .mask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }, .spec = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, }, }, .items[1] = { @@ -429,10 +425,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { .items[0] = { .type = RTE_FLOW_ITEM_TYPE_ETH, .mask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 }, }, .spec = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 }, }, }, .items[1] = { @@ -463,10 +459,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { .items[0] = { .type = RTE_FLOW_ITEM_TYPE_ETH, .mask = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, }, .spec = &(const struct rte_flow_item_eth){ - .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, }, }, .items[1] = { diff --git a/examples/l2fwd-macsec/main.c b/examples/l2fwd-macsec/main.c index a5d7a84828..6210751626 100644 --- a/examples/l2fwd-macsec/main.c +++ b/examples/l2fwd-macsec/main.c @@ -510,8 +510,8 @@ create_default_flow(uint16_t portid) struct rte_flow *flow; struct rte_flow_item_eth eth; static const struct rte_flow_item_eth eth_mask = { - .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", - .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", + .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, .hdr.ether_type = RTE_BE16(0xFFFF), }; int ret; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2026-01-06 11:31:46.165443252 +0200 +++ 0001-ethdev-convert-string-initialization.patch 2026-01-06 11:31:46.071394000 +0200 @@ -1 +1 @@ -From e0d947a1e6c2f80aa039a4f7082a8aa16797d8b9 Mon Sep 17 00:00:00 2001 +From 87493569dfe5a75bc67aac91b55ceee5de45ca82 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit e0d947a1e6c2f80 ] + @@ -63,18 +65,16 @@ - app/test-pmd/cmdline_flow.c | 31 ++++----- - app/test/test_bpf.c | 2 +- - app/test/test_pcapng.c | 2 +- - app/test/test_security_inline_macsec.c | 4 +- - doc/guides/prog_guide/ethdev/flow_offload.rst | 2 +- - drivers/net/cxgbe/cxgbe_flow.c | 14 ++-- - drivers/net/dpaa2/dpaa2_flow.c | 14 ++-- - drivers/net/mlx4/mlx4_flow.c | 6 +- - drivers/net/mlx5/mlx5_flow.c | 20 +++--- - drivers/net/mlx5/mlx5_flow_dv.c | 26 ++++---- - drivers/net/mlx5/mlx5_flow_hw.c | 66 +++++++++---------- - drivers/net/mlx5/mlx5_trigger.c | 20 +++--- - drivers/net/nfp/flower/nfp_flower_flow.c | 14 ++-- - drivers/net/nfp/nfp_net_flow.c | 8 +-- - drivers/net/tap/tap_flow.c | 30 ++++----- - examples/l2fwd-macsec/main.c | 4 +- - lib/ethdev/rte_flow.h | 44 ++++++------- - 17 files changed, 144 insertions(+), 163 deletions(-) + app/test-pmd/cmdline_flow.c | 31 +++++++++-------- + app/test/test_bpf.c | 2 +- + app/test/test_pcapng.c | 2 +- + app/test/test_security_inline_macsec.c | 4 +-- + doc/guides/prog_guide/rte_flow.rst | 2 +- + drivers/net/cxgbe/cxgbe_flow.c | 14 ++++---- + drivers/net/dpaa2/dpaa2_flow.c | 14 ++++---- + drivers/net/mlx4/mlx4_flow.c | 6 ++-- + drivers/net/mlx5/mlx5_flow.c | 20 +++++------ + drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++------- + drivers/net/mlx5/mlx5_flow_hw.c | 48 +++++++++++++------------- + drivers/net/mlx5/mlx5_trigger.c | 20 +++++------ + drivers/net/nfp/nfp_flow.c | 14 ++++---- + drivers/net/tap/tap_flow.c | 30 +++++++--------- + examples/l2fwd-macsec/main.c | 4 +-- + 15 files changed, 112 insertions(+), 123 deletions(-) @@ -83 +83 @@ -index b7bcf18311..5451b3a453 100644 +index 661c72c7ef..4998c2cd2d 100644 @@ -86 +86 @@ -@@ -898,20 +898,20 @@ struct vxlan_encap_conf vxlan_encap_conf = { +@@ -833,20 +833,20 @@ struct vxlan_encap_conf vxlan_encap_conf = { @@ -114 +114 @@ -@@ -934,16 +934,16 @@ struct action_vxlan_encap_data { +@@ -869,16 +869,16 @@ struct action_vxlan_encap_data { @@ -138 +138 @@ -@@ -8304,7 +8304,8 @@ parse_prefix(struct context *ctx, const struct token *token, +@@ -7676,7 +7676,8 @@ parse_prefix(struct context *ctx, const struct token *token, @@ -149 +149 @@ -index 7819d6aba9..90e10d7d2c 100644 +index f83e72a9ad..1b89b3fd5d 100644 @@ -152 +152 @@ -@@ -3361,7 +3361,7 @@ test_bpf_filter_sanity(pcap_t *pcap) +@@ -3346,7 +3346,7 @@ test_bpf_filter_sanity(pcap_t *pcap) @@ -162 +162 @@ -index b219873c3a..8f2cff36c3 100644 +index 5cdde0542a..75ff461e8a 100644 @@ -189,5 +189,5 @@ -diff --git a/doc/guides/prog_guide/ethdev/flow_offload.rst b/doc/guides/prog_guide/ethdev/flow_offload.rst -index 906d6014f5..2d6187ed11 100644 ---- a/doc/guides/prog_guide/ethdev/flow_offload.rst -+++ b/doc/guides/prog_guide/ethdev/flow_offload.rst -@@ -3865,7 +3865,7 @@ For example, to create a pattern template to match on the destination MAC: +diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst +index 627b845bfb..7453ce6d0e 100644 +--- a/doc/guides/prog_guide/rte_flow.rst ++++ b/doc/guides/prog_guide/rte_flow.rst +@@ -3836,7 +3836,7 @@ For example, to create a pattern template to match on the destination MAC: @@ -235 +235 @@ -index 62e350d736..1b55d8dd17 100644 +index e590f6f748..4b6697552f 100644 @@ -293 +293 @@ -index 72fb3a55ba..031db8176b 100644 +index 239ea2be03..e955e41ee1 100644 @@ -296 +296 @@ -@@ -2668,8 +2668,8 @@ mlx5_flow_validate_item_eth(const struct rte_eth_dev *dev, +@@ -2742,8 +2742,8 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item, @@ -307 +307 @@ -@@ -2933,12 +2933,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_eth_dev *dev, +@@ -3005,12 +3005,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item, @@ -324 +324 @@ -@@ -3163,7 +3161,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev, +@@ -3230,7 +3228,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev, @@ -333 +333 @@ -@@ -3249,7 +3247,7 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, +@@ -3313,7 +3311,7 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, @@ -340 +339,0 @@ - .flags = 0xff, @@ -342 +341,2 @@ -@@ -3563,7 +3561,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item, + +@@ -3611,7 +3609,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item, @@ -352 +352 @@ -index 89057edbcf..8bcdb3f99e 100644 +index d42b95ce0c..2be9ddf186 100644 @@ -355,18 +355,17 @@ -@@ -7697,12 +7697,10 @@ const struct rte_flow_item_ipv4 nic_ipv4_mask = { - - const struct rte_flow_item_ipv6 nic_ipv6_mask = { - .hdr = { -- .src_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -- .dst_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, -+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - .vtc_flow = RTE_BE32(0xffffffff), - .proto = 0xff, - .hop_limits = 0xff, -@@ -9291,8 +9289,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item, +@@ -7431,11 +7431,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, + const struct rte_flow_item_ipv6 nic_ipv6_mask = { + .hdr = { + .src_addr = +- "\xff\xff\xff\xff\xff\xff\xff\xff" +- "\xff\xff\xff\xff\xff\xff\xff\xff", ++ {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, ++ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .dst_addr = +- "\xff\xff\xff\xff\xff\xff\xff\xff" +- "\xff\xff\xff\xff\xff\xff\xff\xff", ++ {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, ++ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + .vtc_flow = RTE_BE32(0xffffffff), + .proto = 0xff, + .hop_limits = 0xff, +@@ -8951,8 +8951,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item, @@ -383 +382 @@ -@@ -9549,12 +9547,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item, +@@ -9209,12 +9209,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item, @@ -400 +399 @@ -@@ -10064,7 +10060,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, +@@ -9734,7 +9732,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, @@ -410 +409 @@ -index d243b59b71..96be742b94 100644 +index d17b4d560e..0e133ede15 100644 @@ -413 +412 @@ -@@ -377,67 +377,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX] +@@ -235,67 +235,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX] @@ -501,29 +500 @@ -@@ -8250,12 +8250,10 @@ const struct rte_flow_item_ipv6 hws_nic_ipv6_mask = { - .payload_len = RTE_BE16(0xffff), - .proto = 0xff, - .hop_limits = 0xff, -- .src_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -- .dst_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, -+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }, - .has_frag_ext = 1, - }; -@@ -9936,8 +9934,8 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev, - .egress = 1, - }; - struct rte_flow_item_eth promisc = { -- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", -- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", -+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, -+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - .hdr.ether_type = 0, - }; - struct rte_flow_item eth_all[] = { -@@ -9974,8 +9972,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow +@@ -7966,8 +7966,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow @@ -540,12 +511 @@ -@@ -15476,8 +15474,8 @@ mlx5_flow_hw_create_tx_default_mreg_copy_flow(struct rte_eth_dev *dev) - { - struct mlx5_priv *priv = dev->data->dev_private; - struct rte_flow_item_eth promisc = { -- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", -- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00", -+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, -+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - .hdr.ether_type = 0, - }; - struct rte_flow_item eth_all[] = { -@@ -15815,7 +15813,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev, +@@ -12726,7 +12726,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev, @@ -560 +520 @@ -@@ -15861,7 +15859,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev, +@@ -12772,7 +12772,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev, @@ -570 +530 @@ -index a65a460731..7654f4d2ed 100644 +index 47c80ebd3c..d2af029311 100644 @@ -573 +533 @@ -@@ -1568,23 +1568,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) +@@ -1587,23 +1587,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) @@ -603 +563 @@ -@@ -1653,8 +1653,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) +@@ -1672,8 +1672,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) @@ -614 +574 @@ -@@ -1664,8 +1664,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) +@@ -1683,8 +1683,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) @@ -625,5 +585,5 @@ -diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c -index 3023e68ae8..e94c7e22e3 100644 ---- a/drivers/net/nfp/flower/nfp_flower_flow.c -+++ b/drivers/net/nfp/flower/nfp_flower_flow.c -@@ -2504,8 +2504,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { +diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c +index 13f58b210e..a5aacae855 100644 +--- a/drivers/net/nfp/nfp_flow.c ++++ b/drivers/net/nfp/nfp_flow.c +@@ -1804,8 +1804,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { @@ -640 +600 @@ -@@ -2557,10 +2557,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { +@@ -1857,10 +1857,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { @@ -655 +615 @@ -@@ -2618,7 +2618,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { +@@ -1918,7 +1918,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { @@ -664,19 +623,0 @@ -diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c -index 5db4712193..e9f0ce3710 100644 ---- a/drivers/net/nfp/nfp_net_flow.c -+++ b/drivers/net/nfp/nfp_net_flow.c -@@ -406,10 +406,10 @@ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { - .mask_support = &(const struct rte_flow_item_ipv6){ - .hdr = { - .proto = 0xff, -- .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -- .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, -+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }, - }, - .mask_default = &rte_flow_item_ipv6_mask, @@ -684 +625 @@ -index 0a90c0487b..5ae1faf916 100644 +index b32ad7eaa5..9a9233b882 100644 @@ -687 +628 @@ -@@ -166,8 +166,8 @@ static const struct tap_flow_items tap_flow_items[] = { +@@ -259,8 +259,8 @@ static const struct tap_flow_items tap_flow_items[] = { @@ -698 +639 @@ -@@ -209,14 +209,10 @@ static const struct tap_flow_items tap_flow_items[] = { +@@ -302,14 +302,10 @@ static const struct tap_flow_items tap_flow_items[] = { @@ -717 +658 @@ -@@ -299,7 +295,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { +@@ -392,7 +388,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { @@ -726 +667 @@ -@@ -316,10 +312,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { +@@ -409,10 +405,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { @@ -739 +680 @@ -@@ -336,10 +332,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { +@@ -429,10 +425,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { @@ -752 +693 @@ -@@ -370,10 +366,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { +@@ -463,10 +459,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = { @@ -766 +707 @@ -index b262d3ba0b..73e32fc197 100644 +index a5d7a84828..6210751626 100644 @@ -769 +710 @@ -@@ -512,8 +512,8 @@ create_default_flow(uint16_t portid) +@@ -510,8 +510,8 @@ create_default_flow(uint16_t portid) @@ -780,140 +720,0 @@ -diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h -index a2929438bf..22c5c147d0 100644 ---- a/lib/ethdev/rte_flow.h -+++ b/lib/ethdev/rte_flow.h -@@ -903,8 +903,8 @@ struct rte_flow_item_eth { - /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ - #ifndef __cplusplus - static const struct rte_flow_item_eth rte_flow_item_eth_mask = { -- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", -- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", -+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, -+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - .hdr.ether_type = RTE_BE16(0x0000), - }; - #endif -@@ -1005,12 +1005,10 @@ struct rte_flow_item_ipv6 { - #ifndef __cplusplus - static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = { - .hdr = { -- .src_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -- .dst_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, -+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }, - }; - #endif -@@ -1132,7 +1130,7 @@ struct rte_flow_item_vxlan { - /** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN. */ - #ifndef __cplusplus - static const struct rte_flow_item_vxlan rte_flow_item_vxlan_mask = { -- .hdr.vni = "\xff\xff\xff", -+ .hdr.vni = { 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1185,7 +1183,7 @@ struct rte_flow_item_nvgre { - /** Default mask for RTE_FLOW_ITEM_TYPE_NVGRE. */ - #ifndef __cplusplus - static const struct rte_flow_item_nvgre rte_flow_item_nvgre_mask = { -- .tni = "\xff\xff\xff", -+ .tni = { 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1205,7 +1203,7 @@ struct rte_flow_item_mpls { - /** Default mask for RTE_FLOW_ITEM_TYPE_MPLS. */ - #ifndef __cplusplus - static const struct rte_flow_item_mpls rte_flow_item_mpls_mask = { -- .label_tc_s = "\xff\xff\xf0", -+ .label_tc_s = { 0xff, 0xff, 0xf0 }, - }; - #endif - -@@ -1349,7 +1347,7 @@ struct rte_flow_item_geneve { - /** Default mask for RTE_FLOW_ITEM_TYPE_GENEVE. */ - #ifndef __cplusplus - static const struct rte_flow_item_geneve rte_flow_item_geneve_mask = { -- .vni = "\xff\xff\xff", -+ .vni = { 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1386,7 +1384,7 @@ struct rte_flow_item_vxlan_gpe { - */ - #ifndef __cplusplus - static const struct rte_flow_item_vxlan_gpe rte_flow_item_vxlan_gpe_mask = { -- .hdr.vni = "\xff\xff\xff", -+ .hdr.vni = { 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1420,9 +1418,9 @@ struct rte_flow_item_arp_eth_ipv4 { - #ifndef __cplusplus - static const struct rte_flow_item_arp_eth_ipv4 - rte_flow_item_arp_eth_ipv4_mask = { -- .hdr.arp_data.arp_sha.addr_bytes = "\xff\xff\xff\xff\xff\xff", -+ .hdr.arp_data.arp_sha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - .hdr.arp_data.arp_sip = RTE_BE32(UINT32_MAX), -- .hdr.arp_data.arp_tha.addr_bytes = "\xff\xff\xff\xff\xff\xff", -+ .hdr.arp_data.arp_tha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - .hdr.arp_data.arp_tip = RTE_BE32(UINT32_MAX), - }; - #endif -@@ -1509,9 +1507,8 @@ struct rte_flow_item_icmp6_nd_ns { - #ifndef __cplusplus - static const - struct rte_flow_item_icmp6_nd_ns rte_flow_item_icmp6_nd_ns_mask = { -- .target_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .target_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1536,9 +1533,8 @@ struct rte_flow_item_icmp6_nd_na { - #ifndef __cplusplus - static const - struct rte_flow_item_icmp6_nd_na rte_flow_item_icmp6_nd_na_mask = { -- .target_addr = -- "\xff\xff\xff\xff\xff\xff\xff\xff" -- "\xff\xff\xff\xff\xff\xff\xff\xff", -+ .target_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1587,7 +1583,7 @@ struct rte_flow_item_icmp6_nd_opt_sla_eth { - #ifndef __cplusplus - static const struct rte_flow_item_icmp6_nd_opt_sla_eth - rte_flow_item_icmp6_nd_opt_sla_eth_mask = { -- .sla.addr_bytes = "\xff\xff\xff\xff\xff\xff", -+ .sla.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }; - #endif - -@@ -1612,7 +1608,7 @@ struct rte_flow_item_icmp6_nd_opt_tla_eth { - #ifndef __cplusplus - static const struct rte_flow_item_icmp6_nd_opt_tla_eth - rte_flow_item_icmp6_nd_opt_tla_eth_mask = { -- .tla.addr_bytes = "\xff\xff\xff\xff\xff\xff", -+ .tla.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, - }; - #endif - -@@ -2075,7 +2071,7 @@ struct rte_flow_item_ib_bth { - static const struct rte_flow_item_ib_bth rte_flow_item_ib_bth_mask = { - .hdr = { - .opcode = 0xff, -- .dst_qp = "\xff\xff\xff", -+ .dst_qp = { 0xff, 0xff, 0xff }, - }, - }; - #endif