From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E282CA04F3 for ; Thu, 19 Dec 2019 15:35:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D90D71BF73; Thu, 19 Dec 2019 15:35:01 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id 0D3D71BF73 for ; Thu, 19 Dec 2019 15:35:01 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id u2so5843691wmc.3 for ; Thu, 19 Dec 2019 06:35:01 -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=KjZC1gvobL9FrIpEgbI1wjVGDUYX3BHAUnJ0XfmzeYQ=; b=ZCnQyZ6LlACrdU9SH7nFkni0oXBHX2gVlPbmgFBlywk9gSiQx85Tds6UtVDJFODvlp jHzam2wEwL/btZQS3TFB1m34uI1/RbtlI4o3oHRqJ3/TdSvNU2HKeuGJXwzpRANzah93 yiQvSN74IpgMPklBw3yKPyXI6wRrShqv0K7KkJcIrZm9CzL/pkE3w1ainwuGy6IuOl34 uHIpOKyDQe78kzceRfOHPlKSu17BEppJ6ipUZzl0GsZwaBtEXYSzxL/cjjGC7FWp6voG d79D89qGisz3jEO0YdLypvfPR4Bd8sbwWTx5woy7YMPfeXqsyPbfh/LyDWEfsDJKcHxP 6Z2Q== 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=KjZC1gvobL9FrIpEgbI1wjVGDUYX3BHAUnJ0XfmzeYQ=; b=COTNo+L7m7tdeLc1+QQZ/8Hr+3f2eHpsO7VNwNUpsrrpEIWgxCFAH9KLfMChXNSOka lY+EJgQX4r4/iWEMcLEviGSFp3CHTQGj7x4L6iaiQdNnjLEfKljJVwp4NgvD44fGpIq/ VwV3xBt4dZKRrW59K/dBLy0VK1vygKg02po/kICSnZF06DFFMxu/DbMUMvbXJJTcLjvR cP2dn93sxghCN95r4wlk4CAjSBX6qb7eKd8gLSaFXl5YdgsxM36sZYryMFuM8VlSg+4W LKsr+LUw5vaz2W9ymxietxUzAw9qCguOxydlHaE/QOSnV066+nheb9lKsJjQPGlchkmr ZNpw== X-Gm-Message-State: APjAAAWmlO+TUUWxGYpUqbv5NWFP/+gcku+f7T3pTBmW/CgcVBLNfdbJ TKxvqgK3XURUskcK59Zjrw0= X-Google-Smtp-Source: APXvYqzonPkcC6CsOHsaDd9rOjmG5ve57EwPQ4hEXI7K0Z+JTUj7Dxo8k9HSS5A3ER+WtV5BIkAZ+w== X-Received: by 2002:a1c:1b41:: with SMTP id b62mr10156995wmb.53.1576766100763; Thu, 19 Dec 2019 06:35:00 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r62sm2049438wma.32.2019.12.19.06.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:35:00 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Andrew Rybchenko , dpdk stable Date: Thu, 19 Dec 2019 14:32:31 +0000 Message-Id: <20191219143447.21506-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix endian annotation for SPI item' has been queued to LTS release 17.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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. Thanks. Luca Boccassi --- >From 940d6c60d5748d9b2c243e55148fc0fa812c6ce7 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 20 Aug 2019 15:45:03 +0200 Subject: [PATCH] ethdev: fix endian annotation for SPI item [ upstream commit fbb25a3878cc7c6de4c68c8cee01983d127e2205 ] Security Parameters Index (SPI) should be set with network endian values. While 0xffffffff == htonl(0xffffffff), this missing annotation is caught by sparse when compiling ovs (dpdk-latest branch). Fixes: d4b684f7197a ("net: add ESP header to generic flow steering") Signed-off-by: David Marchand Reviewed-by: Andrew Rybchenko --- lib/librte_ether/rte_flow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index 47c88ea520..8cbf38df3a 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -807,7 +807,7 @@ struct rte_flow_item_esp { #ifndef __cplusplus static const struct rte_flow_item_esp rte_flow_item_esp_mask = { .hdr = { - .spi = 0xffffffff, + .spi = RTE_BE32(0xffffffff), }, }; #endif -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:26.509052690 +0000 +++ 0004-ethdev-fix-endian-annotation-for-SPI-item.patch 2019-12-19 14:32:25.393283707 +0000 @@ -1,27 +1,28 @@ -From fbb25a3878cc7c6de4c68c8cee01983d127e2205 Mon Sep 17 00:00:00 2001 +From 940d6c60d5748d9b2c243e55148fc0fa812c6ce7 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 20 Aug 2019 15:45:03 +0200 Subject: [PATCH] ethdev: fix endian annotation for SPI item +[ upstream commit fbb25a3878cc7c6de4c68c8cee01983d127e2205 ] + Security Parameters Index (SPI) should be set with network endian values. While 0xffffffff == htonl(0xffffffff), this missing annotation is caught by sparse when compiling ovs (dpdk-latest branch). Fixes: d4b684f7197a ("net: add ESP header to generic flow steering") -Cc: stable@dpdk.org Signed-off-by: David Marchand Reviewed-by: Andrew Rybchenko --- - lib/librte_ethdev/rte_flow.h | 2 +- + lib/librte_ether/rte_flow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h -index b66bf1495b..354cb1dd0f 100644 ---- a/lib/librte_ethdev/rte_flow.h -+++ b/lib/librte_ethdev/rte_flow.h -@@ -935,7 +935,7 @@ struct rte_flow_item_esp { +diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h +index 47c88ea520..8cbf38df3a 100644 +--- a/lib/librte_ether/rte_flow.h ++++ b/lib/librte_ether/rte_flow.h +@@ -807,7 +807,7 @@ struct rte_flow_item_esp { #ifndef __cplusplus static const struct rte_flow_item_esp rte_flow_item_esp_mask = { .hdr = {