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 33D70A0524 for ; Fri, 5 Feb 2021 12:34:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F5A640682; Fri, 5 Feb 2021 12:34:06 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id EC93740682 for ; Fri, 5 Feb 2021 12:34:04 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id z6so7270124wrq.10 for ; Fri, 05 Feb 2021 03:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O0uIxGjIfB1klJ7ldOLO++Z40djp0vloB4dX8Y06ppM=; b=ihMlYrtG7s09ZEMr2s/RBogJe1GXjrEpAhNxz/y8zxN9DOtGWOngsHnbRwdocQbm0d yZvwoz1Aq1G8YzzVt43JN5l3CLkL4HbmwUOF8EhcaR62nIyLCI0e9rFdQZ7YUFyKts2N LIklVXVoDhXQCuNqM59O50kl71tbPqorA1iC5mdB39okLRz1NDuBTI0kmHiVqktVW+xW GC9n0d2pSHMWLk8MkPA81Q2FnkHLKO5b2xY9F4cqepx3n3PVXllLwecerLt90iUCZERV AkFNQPoPnBuf6QNNZi9fI9D3h7OJkoPR+tE8SN0Cqi3uFZqITD7yyW5RqyBUIt0KFvZ+ TAXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O0uIxGjIfB1klJ7ldOLO++Z40djp0vloB4dX8Y06ppM=; b=EfRbac+w57TPiwq5hyxqBIdztL4sDkfLk4ijDDaHZ6UcqwfDnaidvi59eY4kigR0BN d9T3zmZp1idmOQrEaK7ssCwKdkQhYLh256i8oBZR0jYkiecXHNkK8j12bVMszasek6Cv AZUXLT2hLDOrI1YugSlc5i+0XbcfvCyd+qgOOXdiiquaCPGHhALLvAmjtRUTWxd/6i7O +TNwnXhbMonZDAhxaOAL6YaQmJ71+qDnvPJL5L0z5QezqzpTlABH2WCmbDUb2ZTb3Kwo e0eXtOQ+IhmmUtgM8qkedMuZNdpuIcYrQqfok619wsMFW5J7ObIf757Km4uPI7RhN8+z +0LA== X-Gm-Message-State: AOAM530fp1gu7WPsRLbhQcB/eEIcxWRV+L2laHjqNaJwM98VZOJ8ptnn K30DI00q4jt4msT2NzMyHNs= X-Google-Smtp-Source: ABdhPJyoRXmX0K9q7sntRdP0hChYEkuQ4dZ8CIw2jNuk0D5CPdC968IDZ0PsL3QT1ctiWom5N/heFw== X-Received: by 2002:adf:8464:: with SMTP id 91mr4436937wrf.188.1612524844785; Fri, 05 Feb 2021 03:34:04 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s23sm8431956wmc.35.2021.02.05.03.34.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:34:04 -0800 (PST) From: luca.boccassi@gmail.com To: George Prekas Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:33 +0000 Message-Id: <20210205111920.1272063-167-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix IP checksum calculation' has been queued to stable release 20.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a098bebd49fe766384d43cf1e23882201b50d7e6 Thanks. Luca Boccassi --- >From a098bebd49fe766384d43cf1e23882201b50d7e6 Mon Sep 17 00:00:00 2001 From: George Prekas Date: Thu, 7 Jan 2021 14:42:28 -0600 Subject: [PATCH] app/testpmd: fix IP checksum calculation [ upstream commit d841ef857dac00657aeff0a764947e064f86f550 ] Strict-aliasing rules are violated by cast to uint16_t* in flowgen.c and the calculated IP checksum is wrong. Use attribute __may_alias__ to fix the problem. Fixes: e9e23a617eb8 ("app/testpmd: add flowgen forwarding engine") Signed-off-by: George Prekas Reviewed-by: Ferruh Yigit --- app/test-pmd/flowgen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index acf3e24605..cabfc688ff 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -53,8 +53,11 @@ static struct rte_ether_addr cfg_ether_dst = #define IP_DEFTTL 64 /* from RFC 1340. */ +/* Use this type to inform GCC that ip_sum violates aliasing rules. */ +typedef unaligned_uint16_t alias_int16_t __attribute__((__may_alias__)); + static inline uint16_t -ip_sum(const unaligned_uint16_t *hdr, int hdr_len) +ip_sum(const alias_int16_t *hdr, int hdr_len) { uint32_t sum = 0; @@ -150,7 +153,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs) next_flow); ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_size - sizeof(*eth_hdr)); - ip_hdr->hdr_checksum = ip_sum((unaligned_uint16_t *)ip_hdr, + ip_hdr->hdr_checksum = ip_sum((const alias_int16_t *)ip_hdr, sizeof(*ip_hdr)); /* Initialize UDP header. */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.748416777 +0000 +++ 0167-app-testpmd-fix-IP-checksum-calculation.patch 2021-02-05 11:18:29.122697128 +0000 @@ -1 +1 @@ -From d841ef857dac00657aeff0a764947e064f86f550 Mon Sep 17 00:00:00 2001 +From a098bebd49fe766384d43cf1e23882201b50d7e6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d841ef857dac00657aeff0a764947e064f86f550 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org