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 9B4E2A034F for ; Tue, 1 Mar 2022 11:46:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96934407FF; Tue, 1 Mar 2022 11:46:14 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 07B3E426E4 for ; Tue, 1 Mar 2022 11:46:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kZB6YR5E/FvLYQQd7W9Oz1K5dLAjxKzFWozb9HBdFJc=; b=KEBnqkqncF8bIWClRg+bzGwN9MFni6Zn4HAjUgHuD1Kd1uopT4HGLmfWK/YKvDE9j8u6Z8 ArdCx9f+hrMzhFC3Kxlj07J/zvgowJblqDZRFnr2ZP83n7fszD37FLUmcRfVxDa/SRr8fA Ugu7M/SCqbGmfK78VZZyfG+cjVlC0VE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-277-Xi4vPsC9O1Saap3NLP1JRA-1; Tue, 01 Mar 2022 05:46:09 -0500 X-MC-Unique: Xi4vPsC9O1Saap3NLP1JRA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44202186833A; Tue, 1 Mar 2022 10:46:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 391B475535; Tue, 1 Mar 2022 10:46:07 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'app/testpmd: fix raw encap of GENEVE option' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:51 +0000 Message-Id: <20220301104300.334382-95-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 03/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9 Thanks. Kevin --- >From a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Thu, 24 Feb 2022 09:02:14 +0200 Subject: [PATCH] app/testpmd: fix raw encap of GENEVE option [ upstream commit d9e597141fd3a69278c31b1daf6da7ce54de3b8e ] The structure "rte_flow_item_geneve_opt" is not a protocol header of geneve tunnel option from rfc8926. The field "data" is a pointer which points to the actual variable-length option data. So the structure is not packed. There is 4 bytes hole before the pointer in a 64-bit system. The option header is just 4 bytes. When using offsetof() to get the fixed part's size of option header, the wrong value 8 was got. When constructing the encap header, a wrong size and offset was used due to this hole. With this commit, the fixed part's size is calculated explicitly based on all fields. Fixes: 55c074f3ba1d ("app/testpmd: support GENEVE option item") Signed-off-by: Bing Zhao Reviewed-by: Viacheslav Ovsiienko --- app/test-pmd/cmdline_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index bbaf18d76e..a8140eda92 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -9156,5 +9156,6 @@ cmd_set_raw_parsed(const struct buffer *in) opt = (const struct rte_flow_item_geneve_opt *) item->spec; - size = offsetof(struct rte_flow_item_geneve_opt, data); + size = offsetof(struct rte_flow_item_geneve_opt, + option_len) + sizeof(uint8_t); if (opt->option_len && opt->data) { *total_size += opt->option_len * -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.986381410 +0000 +++ 0095-app-testpmd-fix-raw-encap-of-GENEVE-option.patch 2022-03-01 10:41:01.468244132 +0000 @@ -1 +1 @@ -From d9e597141fd3a69278c31b1daf6da7ce54de3b8e Mon Sep 17 00:00:00 2001 +From a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d9e597141fd3a69278c31b1daf6da7ce54de3b8e ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index b5f1191e55..4f7a9f17f9 100644 +index bbaf18d76e..a8140eda92 100644 @@ -33 +34 @@ -@@ -10967,5 +10967,6 @@ cmd_set_raw_parsed(const struct buffer *in) +@@ -9156,5 +9156,6 @@ cmd_set_raw_parsed(const struct buffer *in)