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 28142A0C41 for ; Tue, 30 Nov 2021 17:41:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 233094118F; Tue, 30 Nov 2021 17:41:13 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 500D6410F7 for ; Tue, 30 Nov 2021 17:41:12 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2A54B3FFE1 for ; Tue, 30 Nov 2021 16:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290472; bh=uWLXk4uZjsr9O1QSgT13W5mUY/4DRFIYGiJ9kXIFVBk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WFyxpC7vLnPdNLm3ejxZifwwvKryHBRWm2LNV8PFwjCpaFGg3J2o9+YiWC96WpZTr 114tPdRSCtRiOmnGo9geI+vxCSPFSOex8SXJua/pVaqb4LH1GMiOG6Dje/xAQiiB+U ipCFk3trAi75/OuwiFo5m+1CgmSc3ogwHd3QCDADSqLzIkUX+XCyRI812Tcxqpb6Yl EGfka/0U9K3TMaTcd8ZzrVfp5NLgOltTaJc698Own/hnv+Dyeoz04WtlkPIgy7hWPO 8rUJayIiWE+hGY+4XuCSHSXfIil9SfI9Xy+prVOAjbAnzSAUs0LtZlkPoOn3sFVS1o 3MHwWFPCVA6rg== Received: by mail-ed1-f72.google.com with SMTP id k7-20020aa7c387000000b003e7ed87fb31so17582127edq.3 for ; Tue, 30 Nov 2021 08:41:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uWLXk4uZjsr9O1QSgT13W5mUY/4DRFIYGiJ9kXIFVBk=; b=UvGvDpaS539981FtdPSMcFcT6TTkAwFP6t4vpn/YES76BUqVx3orQaKHnQC3+ufGDe XcYU/nCqSubZMQfB2ctjZ6rhVWGWJt2z/EvrRYJr64UpRMg8azvL0+ttYkNMWgewtewe QrHzSh5eyrC8IBvhpcAryk0rUX8P5OUaezx1Hj8ZfLNIAKNtAEMkz/Xppbc7i1vtkxEw mTBp6H0oZx86NZq6GmHX5j6QmJyd5IsCpEGsEzNQw/GIOXsJmzgn0f5CijRY8ISQ/X9Y oYeRvpuvqqvAuvMQOz8DmA1Tert8IQ7EURuW+2NcbcuOAh09UNaCi3sPkbLkxMCBL3Yc wqNg== X-Gm-Message-State: AOAM531uYK+a3p5qluWETQzjIbCXbmwNJVfmrEuS7wDOYCDqOA/VzkEr gUghlvhv/fHBgPPUtsVHXiEnITOzH+qDTLlK6IZEBH3BmKHBBHvuCpbirPHJX+qL9Q75xOBoXRa H3/oQlOx0hV0zt0QkYbCs/LPT X-Received: by 2002:aa7:cc09:: with SMTP id q9mr143352edt.102.1638290471382; Tue, 30 Nov 2021 08:41:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrDaIx/TsL6vdWezesUn6uULcoLzJspOW8GFFeSNLPQqNxgbYzdQ1XGYZvS8bDYciSywgUpg== X-Received: by 2002:aa7:cc09:: with SMTP id q9mr143333edt.102.1638290471231; Tue, 30 Nov 2021 08:41:11 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id kx3sm9154519ejc.112.2021.11.30.08.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:41:10 -0800 (PST) From: christian.ehrhardt@canonical.com To: Eli Britstein Cc: Olivier Matz , dpdk stable Subject: patch 'net: avoid cast-align warning in VLAN insert function' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:02 +0100 Message-Id: <20211130163605.2460997-98-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/2cbe5b75dbea7ba4ee025f32887284ae77bca7d9 Thanks. Christian Ehrhardt --- >From 2cbe5b75dbea7ba4ee025f32887284ae77bca7d9 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 [ 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 e069dc7fe0..8a31988f21 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.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:11.558666342 +0100 +++ 0098-net-avoid-cast-align-warning-in-VLAN-insert-function.patch 2021-11-30 16:50:05.894874293 +0100 @@ -1 +1 @@ -From a3f8d05871887d257703f6f073da002b6c568519 Mon Sep 17 00:00:00 2001 +From 2cbe5b75dbea7ba4ee025f32887284ae77bca7d9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a3f8d05871887d257703f6f073da002b6c568519 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ - lib/net/rte_ether.h | 2 +- + lib/librte_net/rte_ether.h | 2 +- @@ -30,5 +31,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 e069dc7fe0..8a31988f21 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)