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 08066A00C5 for ; Wed, 20 Jul 2022 10:24:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02E6740697; Wed, 20 Jul 2022 10:24:25 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id 498AB4003C for ; Wed, 20 Jul 2022 10:24:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIYmTemJhfslKteB0qtG0/PNvoKEh/roX9UT1x22juKReF1cOrTAC007q3J0I/RM6GkLaPe+RZBL9H90MzgyPSovND/ABzayzD0GpxQjEdDId93lpdYUkiKHs6JSEiXVF+6mIFt3z1z6eA3aECAhwCC3/vGFtsekWn1FECbaigYz9k3h1l+8ai0usMOZh6alndjTN6tAWbbHYMc+oLPh/ZJ2aKu4685GmhmVm8pxED3nsWV/HTU56irEjQc5JebbYUo2Ozai2SvZ+Ukkf35TMiM+7nfaV7JvyIkdcyg+QbRny8i+qnbgjfbNYA6k9Ec0GiJfPEy0ekI/crqLB0eW4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Egi1bLsHQ1mIfhecwcbNBSFVOQJz0JcnU36jILv3dUI=; b=amqdElnjzY30O/jdVE7WlPiKOVoXGOv3qZbyCKXRmWkN9cz1yS2FjIrC47mVKTL73LHiE+M4Ki5s4SFLqNLll3H9LkM7/vcS0QPMBY6akQZ4+JEGu2Iepv2dNId7rhBZ/kGJJVpvSmylVEUgghhS24IN7lyVmG8Rme+x7Nm+oiq6qZRl1e5GZdhIbGNQOMbbA3up41rhNQHtNbc/PEXKZeO6YdyAfYaEHKLmagfaY1cTC4pbjLos62EEzLoleGHwnnOM9xYcH0RmkTEzjVKrcRjjc3tRTXPhlAnei9sONNIyxPvAUH6eOq6QpkAQ4Fep4wUlbmeC734QJBH1gtF+1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.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 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=Egi1bLsHQ1mIfhecwcbNBSFVOQJz0JcnU36jILv3dUI=; b=ZjuIjy8IB1qZTAjFXssCpIgojC9ZPJyJGWY1sItqsTzPW5E5RKXHPYRRyK9AT3v4NxprqdnEjNERS4c6kMEZWa/M5qHWMThZ9pSBz8H+dQVUluELHXb9zDPPoaThIzMvLtEiot+xK68dfiQu+rRc9CiSLCcZc4kn31/Ud2V5wZY7poSzfBxHiPcVp1Fk/3Z9VV3bTt/zATMwjEp9MBbWO043XnLCnBotPbEevRge8NpMthYfaqejLtFNWSMqwj6zC6JV1VAHqEOrU+iC7YyIBA8AJgeQ+5zUscdBhCnRE5+wa/t+9L5sl/p0HvZM5RCfNWr9jAMeC8Mc562OLz7D4g== Received: from MW4PR04CA0115.namprd04.prod.outlook.com (2603:10b6:303:83::30) by DM5PR12MB1497.namprd12.prod.outlook.com (2603:10b6:4:d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Wed, 20 Jul 2022 08:24:21 +0000 Received: from CO1NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:303:83:cafe::d0) by MW4PR04CA0115.outlook.office365.com (2603:10b6:303:83::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21 via Frontend Transport; Wed, 20 Jul 2022 08:24:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT012.mail.protection.outlook.com (10.13.175.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:24:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:24:20 +0000 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.986.26; Wed, 20 Jul 2022 01:24:19 -0700 From: Xueming Li To: Wenxuan Wu CC: , Qi Zhang , dpdk stable Subject: patch 'net/ice/base: fix build with GCC 12' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:59 +0300 Message-ID: <20220720082132.3954126-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a2c92b6-1087-483b-d1d2-08da6a293f3e X-MS-TrafficTypeDiagnostic: DM5PR12MB1497:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jgjptgDEI3/ud1EloLsdTLnHFMwrxELia8Vl1XSAyBygnA5IRVFY6eUq5J/3?= =?us-ascii?Q?Z2jRt3eb4KdWl17Jzm5UYmOL7ZwCImYylyOP5TyPOz8+Ubm+7S3ZKf0PMBr/?= =?us-ascii?Q?5WEUxXbGEhL+YgTzv+DtzQfqbJTN/dtOYciu6LC2Q0fZblxC+2El1GUGnO2I?= =?us-ascii?Q?Z1KoivYyaSPKsfzozs4gKmyoDz1YYlD3Zry3Tafd+RZBvOYmTBDaDLXXkmB2?= =?us-ascii?Q?40B0m0RgdoZW/eLty0sGgyLYNZ9kGaxZllFrdLdNHzzq0XRRz9zMDylbeRUt?= =?us-ascii?Q?MN4VpgABClQk+b1wrrXnbi/bCGJuW53gcqq+aUkGqxRp8GL/wkYtxbF5yxsj?= =?us-ascii?Q?hGtrvnf0G6vuU5ey1k3IdXsx864jBPi/O10MlASwgtqzGH/jjCaBSeRvc5oB?= =?us-ascii?Q?xeBoleUJCScEbpgHD8zyQ0JRMNzV7veGJW5bWDduJpptwub/OB/vdqtaq/XO?= =?us-ascii?Q?yhz5dD3bz6hrFSDPSm8jxFcUBb7e5wzRmdsHsw1e0SccoEkWG3wMjmZN1CZg?= =?us-ascii?Q?lAqdhd9OUcVUusbBSTtlVKenJLctN+xPbINwoQZ+PiIMpM0++eoiqDmC5ys1?= =?us-ascii?Q?bLtVc5AbOyVk4sxzOkh4bWkzoc7nWnnvkaVGVSp0atlunsEVSLvFYYnUc1Ls?= =?us-ascii?Q?/iIS0kTV2c5tb+9XRTegox91o8rDtsw6YG8d6d89V2qtHU4tKzc3HTbNPa/9?= =?us-ascii?Q?X1st2r8vtsINbCii8A2uBwrWhR6MPC9BgIUp2hXeeyBUq5rkendHyijHlEq5?= =?us-ascii?Q?3dYYdHnLVx2PnLUZENPHXxEjRTam4oVG6JO/4Tcq9+43GUkjfee5vvBi0jnO?= =?us-ascii?Q?AdiEAJSuQdhL7aztJILc66VJd+hQT3eX3KU5HBSx7/L9eizcPVZHXMaAj0NP?= =?us-ascii?Q?Fwt7Xd20atRR78VTffV5AXyPPRBt5RZcT7Wvq+rPniowyUq2UTZcUvnmZR0r?= =?us-ascii?Q?0H5NB7Z5xzvcl5i2OLB5AA=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(396003)(136003)(40470700004)(46966006)(36840700001)(54906003)(6286002)(16526019)(6666004)(36860700001)(47076005)(41300700001)(4326008)(7696005)(316002)(1076003)(2616005)(186003)(8676002)(5660300002)(426003)(336012)(6916009)(26005)(86362001)(36756003)(8936002)(70586007)(70206006)(53546011)(356005)(55016003)(2906002)(81166007)(83380400001)(478600001)(966005)(82310400005)(82740400003)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:24:21.2694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2c92b6-1087-483b-d1d2-08da6a293f3e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1497 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 20.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 07/22/22. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/d26e0087571814f789ccd35ff22a94ca01305c8b Thanks. Xueming Li --- >From d26e0087571814f789ccd35ff22a94ca01305c8b Mon Sep 17 00:00:00 2001 From: Wenxuan Wu Date: Thu, 23 Jun 2022 17:01:05 +0800 Subject: [PATCH] net/ice/base: fix build with GCC 12 Cc: Xueming Li [ upstream commit 3e87e12dc8bcb1d06dafcb302b056fee51deb090 ] GCC 12 with -O2 flag would raise the following warning: ../drivers/net/ice/base/ice_switch.c:7220:61: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 7220 | buf[recps].content.lkup_indx[i + 1] = entry->fv_idx[i]; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ This patch changed the type of fv_idx in struct ice_recp_grp_entry to align with its callers which are also u8 type. Fixes: 04b8ec1ea807 ("net/ice/base: add protocol structures and defines") Signed-off-by: Wenxuan Wu Acked-by: Qi Zhang --- drivers/net/ice/base/ice_flex_pipe.c | 2 +- drivers/net/ice/base/ice_flex_pipe.h | 2 +- drivers/net/ice/base/ice_protocol_type.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index 67afb7bbba..ed3363c869 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -2252,7 +2252,7 @@ ice_destroy_tunnel_end: * @off: variable to receive the protocol offset */ enum ice_status -ice_find_prot_off(struct ice_hw *hw, enum ice_block blk, u8 prof, u16 fv_idx, +ice_find_prot_off(struct ice_hw *hw, enum ice_block blk, u8 prof, u8 fv_idx, u8 *prot, u16 *off) { struct ice_fv_word *fv_ext; diff --git a/drivers/net/ice/base/ice_flex_pipe.h b/drivers/net/ice/base/ice_flex_pipe.h index 214c7a2837..9ae3c82b40 100644 --- a/drivers/net/ice/base/ice_flex_pipe.h +++ b/drivers/net/ice/base/ice_flex_pipe.h @@ -25,7 +25,7 @@ enum ice_status ice_acquire_change_lock(struct ice_hw *hw, enum ice_aq_res_access_type access); void ice_release_change_lock(struct ice_hw *hw); enum ice_status -ice_find_prot_off(struct ice_hw *hw, enum ice_block blk, u8 prof, u16 fv_idx, +ice_find_prot_off(struct ice_hw *hw, enum ice_block blk, u8 prof, u8 fv_idx, u8 *prot, u16 *off); enum ice_status ice_find_label_value(struct ice_seg *ice_seg, char const *name, u32 type, diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h index 023d661341..8e0557b212 100644 --- a/drivers/net/ice/base/ice_protocol_type.h +++ b/drivers/net/ice/base/ice_protocol_type.h @@ -394,7 +394,7 @@ struct ice_recp_grp_entry { #define ICE_INVAL_CHAIN_IND 0xFF u16 rid; u8 chain_idx; - u16 fv_idx[ICE_NUM_WORDS_RECIPE]; + u8 fv_idx[ICE_NUM_WORDS_RECIPE]; u16 fv_mask[ICE_NUM_WORDS_RECIPE]; struct ice_pref_recipe_group r_group; }; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:00.205600723 +0800 +++ 0030-net-ice-base-fix-build-with-GCC-12.patch 2022-07-20 15:00:58.724333808 +0800 @@ -1 +1 @@ -From 3e87e12dc8bcb1d06dafcb302b056fee51deb090 Mon Sep 17 00:00:00 2001 +From d26e0087571814f789ccd35ff22a94ca01305c8b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3e87e12dc8bcb1d06dafcb302b056fee51deb090 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -24,2 +26 @@ - drivers/net/ice/base/ice_switch.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) @@ -28 +29 @@ -index f6a29f87c5..3918169001 100644 +index 67afb7bbba..ed3363c869 100644 @@ -31 +32 @@ -@@ -2564,7 +2564,7 @@ ice_destroy_tunnel_end: +@@ -2252,7 +2252,7 @@ ice_destroy_tunnel_end: @@ -41 +42 @@ -index 23ba45564a..ab897de4f3 100644 +index 214c7a2837..9ae3c82b40 100644 @@ -54 +55 @@ -index 8fb95a8a8d..74107de988 100644 +index 023d661341..8e0557b212 100644 @@ -57 +58 @@ -@@ -424,7 +424,7 @@ struct ice_recp_grp_entry { +@@ -394,7 +394,7 @@ struct ice_recp_grp_entry { @@ -66,13 +66,0 @@ -diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h -index a2b3c80107..c67cd09d21 100644 ---- a/drivers/net/ice/base/ice_switch.h -+++ b/drivers/net/ice/base/ice_switch.h -@@ -203,7 +203,7 @@ struct ice_fltr_info { - - struct ice_update_recipe_lkup_idx_params { - u16 rid; -- u16 fv_idx; -+ u8 fv_idx; - bool ignore_valid; - u16 mask; - bool mask_valid;