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 80309A0540 for ; Thu, 7 Jul 2022 09:58:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CE5442836; Thu, 7 Jul 2022 09:58:38 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id C40B740A7B for ; Thu, 7 Jul 2022 09:58:37 +0200 (CEST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.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-0.canonical.com (Postfix) with ESMTPS id 906DE4101B for ; Thu, 7 Jul 2022 07:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180717; bh=KPwBYtPrAJEDJLzeG28MAUWOsY1//qyVehHMRjzoJSg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ueC9OZBqtglWA+MxClnZja5nDFcv3cau4zKikaeEpfaVlJedDYn1to9FDJuyjBITU nqRXF0fTBo4NKPhSeMJTIY2PqwjfUxHqq+xrg0HsUZGrkEEKOzIddFD+DyGQpFec/Z khH72r10NYAtHELdtAZuabMks/hRBWAGvrkojBLNXWrceJgGMPaNo6JFsPItzJYY7h RYa5LBm1+s4DbirIy5aHfW0ui8RKSAhb5fUh3A7AyXeiyLmyiZzfBHiSv6wmpjH8ae BY4S6d3u7Ldzx4NLiJtZKezwhnrSVSJeFtmGU8Y39w0nII84o77ZZykEB3rxpL63z5 qSn/cddhVMoSg== Received: by mail-ej1-f72.google.com with SMTP id sd14-20020a1709076e0e00b0072a7c5a08f4so4465505ejc.21 for ; Thu, 07 Jul 2022 00:58:37 -0700 (PDT) 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=KPwBYtPrAJEDJLzeG28MAUWOsY1//qyVehHMRjzoJSg=; b=2rNiYl4u+7lx3RyAFnnbz5ZeplRNePA23MCahI5MMfpGheQWP2IUPt8p7lDq3hgCvu dA5cykOwkdlSIFFLSWAd7BmBSQSLZf3PLoX/JmF9PxcJXHEdyumSGhclxHUqWPJRijGR 2P/fO0grtQPGYnmFLvitmFl2e2A486fQgb8U98aVUvr5SKzYJXI9hBwyI3cCNY1RiKIJ RQGIVDwWAo6nu6uFvDZPgV63GIyj+5AG0/ku5t7gEVUuF7hCtsaTyoNiKNn66MxLHUTC 9iTrFjg3Amnef8AbiM+9xJt5OLsZSUaY/pDQjppiVQx2I9sfD+vmlp51hPkKP6IONJW1 GB2A== X-Gm-Message-State: AJIora9+pPQ4BioA6M52yHVofsBLGNoZzlxFr23e7GFuKXNeuBHpspn2 It0EosJvzeKPJUcQUqenFuiTy3cC6gKgVtInyi5RGFwvvEAQbFFYd5Esri7Y5QIDaW7+gA56e4K z01Y3eVSO/7grO/bLIdT996VT X-Received: by 2002:a17:907:7f8e:b0:712:f503:1a56 with SMTP id qk14-20020a1709077f8e00b00712f5031a56mr41833080ejc.364.1657180716976; Thu, 07 Jul 2022 00:58:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uF71ioUhJRG2s/H1mkMSPrF4IFv505F/bJcg8J7vl1DK3Uaa8E2/+O0oeVOENPyJhGT6mCMA== X-Received: by 2002:a17:907:7f8e:b0:712:f503:1a56 with SMTP id qk14-20020a1709077f8e00b00712f5031a56mr41833059ejc.364.1657180716737; Thu, 07 Jul 2022 00:58:36 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id w2-20020a170906384200b00722f8d02928sm18667444ejc.174.2022.07.07.00.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:36 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Maxime Coquelin Cc: Chenbo Xia , Aman Singh , dpdk stable Subject: patch 'app/testpmd: revert MAC update in checksum forwarding' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:00 +0200 Message-Id: <20220707075522.194223-65-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-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.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/faaab06d1120655e4dedc29645271f52f338eca1 Thanks. Christian Ehrhardt --- >From faaab06d1120655e4dedc29645271f52f338eca1 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Wed, 8 Jun 2022 14:49:41 +0200 Subject: [PATCH] app/testpmd: revert MAC update in checksum forwarding [ upstream commit 9b4ea7ae77faa8f8aba8c7510c821f75d7863b16 ] This patch reverts commit 10f4620f02e1 ("app/testpmd: modify mac in csum forwarding"), as the checksum forwarding is expected to only perform checksum and not also overwrites the source and destination MAC addresses. Doing so, we can test checksum offloading with real traffic without breaking broadcast packets. Fixes: 10f4620f02e1 ("app/testpmd: modify mac in csum forwarding") Signed-off-by: Maxime Coquelin Acked-by: Chenbo Xia Acked-by: Aman Singh --- app/test-pmd/csumonly.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index ed18843d09..35beb2a954 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -846,10 +846,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) * and inner headers */ eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], - ð_hdr->d_addr); - rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_hdr->s_addr); parse_ethernet(eth_hdr, &info); l3_hdr = (char *)eth_hdr + info.l2_len; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.862686338 +0200 +++ 0065-app-testpmd-revert-MAC-update-in-checksum-forwarding.patch 2022-07-07 09:54:10.977824691 +0200 @@ -1 +1 @@ -From 9b4ea7ae77faa8f8aba8c7510c821f75d7863b16 Mon Sep 17 00:00:00 2001 +From faaab06d1120655e4dedc29645271f52f338eca1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b4ea7ae77faa8f8aba8c7510c821f75d7863b16 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 7df201e047..1a3fd9ce8a 100644 +index ed18843d09..35beb2a954 100644 @@ -28 +29 @@ -@@ -916,10 +916,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) +@@ -846,10 +846,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) @@ -33 +34 @@ -- ð_hdr->dst_addr); +- ð_hdr->d_addr); @@ -35 +36 @@ -- ð_hdr->src_addr); +- ð_hdr->s_addr);