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 B3694A034F for ; Wed, 10 Nov 2021 07:53:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD5DF40142; Wed, 10 Nov 2021 07:53:29 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2064.outbound.protection.outlook.com [40.107.236.64]) by mails.dpdk.org (Postfix) with ESMTP id 7ABEE40142 for ; Wed, 10 Nov 2021 07:53:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cqqESwXfOferx7YhKx8k+6DeB74M06TzB1X5hTJr3f551jlmzFJ54TTBnN+qiq+8OM30fOQiBsrUYKDlVvZpxXgAZ0AF5OshoI9O8ro9g5G04txUGA2KrP5D6lwogkZfyIxRpxBy0j1rA5cEpjRnGIknl768c67+ywQVz+tWz2jLyfMUSCG5x5+J9cQiB6wlQakpZV5tCbowEAAx90IiAVL5kHDzrmiLCN3Zu1pMpqV3+pdrEM8x/SJZVh8b8V+4taEnmdjDLP9l9Xq0cW+IeyWw7xn6DeevgvvQeh+HHdoMVyKQYZ/R/UvMCL2HYBupato2yfUrOMxcqkqf+V/8Og== 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=oK2bunr1WYfugxYwZ30H4N1QFNcQFxH5faf059AoOzY=; b=eUHaby7BsDmFpGr1Ceqegbc0F+/WECTtEXYSfm4MufOJNQR8P6r5kORbc5Xlljf6T50maBYNl2zBjnHl2MWo0Mk5dRQby2hOAadWBH8UqleP9ZWy/m2ga7EzZLuIb2sr211fUyxpeNqVU0sVAssMNxQtQ6Ela+Raffh6H8V6jBCI6QfG3u+Tz0wtCxb48b4BAMbhbsIkGWX+WqGtWjCWyErvTVhBW/mZVNUHKEJGY2axA4fVg6OnA+WDPvjxWWIQYv5xdJ2Ivj2+QYupskXI0AF2bfmm4/GBQYGiJrm+w5/HrjzA5Wgf02Z/CJSMSPannMxOVdgqtMz9qkTuZRYeLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=oK2bunr1WYfugxYwZ30H4N1QFNcQFxH5faf059AoOzY=; b=Bm8QSwWANmprn/tiir4ON6FiMy45KFUZrphWvdyS4vgqkV9CS216wbHltWbcSTR76IXhpgflcsOkc65bwvhri2uRXuC6b6/AoA4m7YYEFH93rARCFZiGMng2z1ITzVNQB8WxId74t0L6o2G87po4sM5quRS63lXukgsxUC/if44G0rPK5MO7sVniT5tT3XnT7SAzvKoyND6aPs4mO4i0AgnjymT5L0AYllnwXY+fl2hLPtiTA3ijK/Ob6ZfglP2YcxC0yX06YpTGF8PHvBe2vHu4F71mJsyfvDPWvOEHpfH2RW0N/NdnW3cpm8Y1CPjE2PO4yM5em5YrjaTh/Kb9oQ== Received: from BN0PR04CA0046.namprd04.prod.outlook.com (2603:10b6:408:e8::21) by BYAPR12MB2999.namprd12.prod.outlook.com (2603:10b6:a03:df::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Wed, 10 Nov 2021 06:53:26 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e8:cafe::d3) by BN0PR04CA0046.outlook.office365.com (2603:10b6:408:e8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend Transport; Wed, 10 Nov 2021 06:53:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:53:25 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:53:21 +0000 From: Xueming Li To: Eli Britstein CC: Luca Boccassi , Olivier Matz , dpdk stable Date: Wed, 10 Nov 2021 14:31:13 +0800 Message-ID: <20211110063216.2744012-190-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5324afda-5468-445d-a12a-08d9a416cb2a X-MS-TrafficTypeDiagnostic: BYAPR12MB2999: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:635; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vouKF7WFW+UUivTUfij9L2fiCXx4xUpIHUIy3LELEh6kSPLEzIJlgQFmKEFgwK5rDkA0tnDY7YoYfZik5Ryv86oxLa61ou4HesnzbeFkFDbYEbjL8q09IxN+3PR9Jsf6XT1d9beGfLlSGyMqCy9bTmJl+BDB3IxmcJXDHAkO8I+kTBIs50a5Zvl62TFmu9jXOhtnGzj8THV5jLbKh+Eik50lHgtZ8kN5269ndbRfvE4mG84BzPpjsfB/33dZbcoKqUCUwTvNSPdOqomCnM9qjNnQrMMMVv/uJmq90W9OyRqZf3LWQj0sNCTL8Q+Vl9XbzXLef55cftwhFkx/+RsEERXtJTQGKTlORlfQjaDpfF56Jy9fNvPQkEugR8oAmZKj0B/a34IvmMpwWMJLWlu/+R81E76VYdclmFQSxITBDDbY4pFGNIJApW30qsLSDYy0La/qocmAf1W6D2HBLTl9H/ZUs/NW3mJAcxDFInVpu39kgoGxFSeNw+loaQStkuWraY8twoKlwSY4kQ1+cjq4KkkLjX40XAIWOiADik1od3hIvdEHZnVpuOWOdioRNDbvpbx1IvMBw7Puoj8Gs+rHJ5mLjhTWmNdDTPGuaOPfFvrBKM/l1I9vz2sss+b5A7QCsFEml3yYaeKscFpVcuvIePGb/s4At0dzAo8SnJVBJygZWeyZmBVh6djIV8xd7x8Ul/bl0IqJ6HAmHx6W9+vNGovyia5CCgJ3rrX0zGHRBebmJUoqqs7jC3qrh2oMPdN2GeKXIn7UnyMQi/IU7QM41p3KnOJ2HW4RDMZF3YQeXcP6GvD6DMEx28cGfJvAQ2+xS3gWWFVw3QeEf+nwvs8gOQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(82310400003)(7636003)(356005)(26005)(55016002)(1076003)(8676002)(966005)(2616005)(70206006)(6666004)(426003)(186003)(6636002)(16526019)(336012)(5660300002)(4326008)(6286002)(54906003)(70586007)(53546011)(37006003)(6862004)(508600001)(7696005)(8936002)(316002)(36860700001)(47076005)(36756003)(86362001)(2906002)(4001150100001)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:53:25.2831 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5324afda-5468-445d-a12a-08d9a416cb2a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2999 Subject: [dpdk-stable] patch 'net: avoid cast-align warning in VLAN insert function' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/7f401592f5b617e40a2e858556f9528855954657 Thanks. Xueming Li --- >From 7f401592f5b617e40a2e858556f9528855954657 Mon Sep 17 00:00:00 2001 From: Eli Britstein Date: Thu, 21 Oct 2021 11:51:30 +0300 Subject: [PATCH] net: avoid cast-align warning in VLAN insert function Cc: Xueming Li [ upstream commit a3f8d05871887d257703f6f073da002b6c568519 ] In rte_vlan_insert there is a casting of rte_pktmbuf_prepend returned value to (struct rte_ether_hdr *), which causes cast-align warning when using strict cast align flag with supporting gcc: gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0 CFLAGS="-Wcast-align=strict" make V=1 -C examples/l2fwd clean static In file included from main.c:35: /dpdk/build/include/rte_ether.h:370:7: warning: cast increases required alignment of target type [-Wcast-align] 370 | nh = (struct rte_ether_hdr *) | ^ As the code assumes correct alignment, add first a (void *) casting, to avoid the warning. Fixes: c974021a5949 ("ether: add soft vlan encap/decap") Signed-off-by: Eli Britstein Acked-by: Olivier Matz --- lib/librte_net/rte_ether.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 060b63fc9b..0baceb2c4a 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -358,7 +358,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) return -EINVAL; oh = rte_pktmbuf_mtod(*m, struct rte_ether_hdr *); - nh = (struct rte_ether_hdr *) + nh = (struct rte_ether_hdr *)(void *) rte_pktmbuf_prepend(*m, sizeof(struct rte_vlan_hdr)); if (nh == NULL) return -ENOSPC; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:10.310208257 +0800 +++ 0189-net-avoid-cast-align-warning-in-VLAN-insert-function.patch 2021-11-10 14:17:02.000745027 +0800 @@ -1 +1 @@ -From a3f8d05871887d257703f6f073da002b6c568519 Mon Sep 17 00:00:00 2001 +From 7f401592f5b617e40a2e858556f9528855954657 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a3f8d05871887d257703f6f073da002b6c568519 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ - lib/net/rte_ether.h | 2 +- + lib/librte_net/rte_ether.h | 2 +- @@ -30,5 +32,5 @@ -diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h -index 2c7da55b6b..1a0dbf0d60 100644 ---- a/lib/net/rte_ether.h -+++ b/lib/net/rte_ether.h -@@ -367,7 +367,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) +diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h +index 060b63fc9b..0baceb2c4a 100644 +--- a/lib/librte_net/rte_ether.h ++++ b/lib/librte_net/rte_ether.h +@@ -358,7 +358,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)