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 11FC6A0C41 for ; Tue, 30 Nov 2021 17:43:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CA7F410F7; Tue, 30 Nov 2021 17:43:48 +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 5DA0241170 for ; Tue, 30 Nov 2021 17:43:46 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 D72664000F for ; Tue, 30 Nov 2021 16:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290625; bh=S25oCNUxIlC5mWxsc+gaZywOsJsEMqQDM1wa5L1QW24=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l4yz8WQW4T69JJUEkTOs7YGmgmk1QXy+TphWVLVpOlR6es8ZiIUapH+BzGoYi7tML sNes3U8uxPzH+7VHDQ+lbuOIQBfNTuOFZ/Wsms3STmSS6aP2SfWe/lOh4j78UqEIbO 8J+zOK3/l6+KMhV1uvOpBcrIjgrISo8199cTGGA5DkjmLYbjEkn8DDxUVxwWeYoP/i GIeBNqtG0+FSi4rRe77769KZN8z9q+8NfrYvR/Et0MVDqAsr8plWdj8s0RiDVi6+PW Vc4wj0DX2D3prtGKMZXroLZQ+7zpdQ+MEdtUITo82BhzprWay1Gm2AfBjvWrLK3HU+ hWSUcerx9Gs2g== Received: by mail-ed1-f70.google.com with SMTP id i19-20020a05640242d300b003e7d13ebeedso17457443edc.7 for ; Tue, 30 Nov 2021 08:43:45 -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=S25oCNUxIlC5mWxsc+gaZywOsJsEMqQDM1wa5L1QW24=; b=jGrQ8nnqYWwviE4k9PUMlo7XH3as0bJkYSWTfW9rbAlDo51IYVWp0KjlcAtq7fHNyP gzK3U/wV0W7Pxi7I+uqJF7XPzUdABIdHfG7A5PNgOcyY9rALw7ZADc7CMtEyt3y3HznX YVkR1aXREX1UFQvlne1OLpzFPnXzBEAHfLA8N8jdtWdVuDJRmqwY6WI2hq93TeKu3SVK eJVJEQQ0EvXZMeizqm/EmweFLi9qFFcwy4QDblcfCt8iaeh+MUrPUpBoJUgeVh5hOBH0 0hGpkIpnjPWJKsSiAh5R/AFKZCVLxi5GJNV5nfPNbAnd66o8d6abkSn0fcEDY7l1BZLT nuGA== X-Gm-Message-State: AOAM5309XKZHTesN0wHHROQS9wrG/59mgxRb5eOs9k/VvBkKmzAbY+z+ 597o35xPKvNuNSSzr+5ZICTvV03UQaNfIcNY288xnUe1ZSHWgQkTn3cDZ3EeZOBVVAnsFWvg5S7 snwKa+JEyI6GYjML0crLa60pF X-Received: by 2002:a17:907:60d0:: with SMTP id hv16mr184747ejc.425.1638290625277; Tue, 30 Nov 2021 08:43:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/ybhFVISr1YM/5WG/1QIXl31AhGB9O4WjSWfhRX7Jd5d5B77HZrOPFIr4Xg51jm0vG9/pKQ== X-Received: by 2002:a17:907:60d0:: with SMTP id hv16mr184731ejc.425.1638290625123; Tue, 30 Nov 2021 08:43:45 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id ds17sm9711078ejc.45.2021.11.30.08.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:43:44 -0800 (PST) From: christian.ehrhardt@canonical.com To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix RSS expansion scheme for GRE header' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:53 +0100 Message-Id: <20211130163605.2460997-149-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/3f65b6101051deb4ad4a19a92c01044f8e52a145 Thanks. Christian Ehrhardt --- >From 3f65b6101051deb4ad4a19a92c01044f8e52a145 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 14 Nov 2021 17:36:14 +0200 Subject: [PATCH] net/mlx5: fix RSS expansion scheme for GRE header [ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ] RFC-2784 allows any valid Ethernet type in GRE protocol type field. Add Ethernet to GRE RSS expansion. Fixes: f4b901a46aec ("net/mlx5: add flow GRE item") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 0805bdb8c9..eff0057a60 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -180,7 +180,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { .type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE, }, [MLX5_EXPANSION_GRE] = { - .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, + .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, + MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6, MLX5_EXPANSION_GRE_KEY, MLX5_EXPANSION_MPLS), -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.526124224 +0100 +++ 0149-net-mlx5-fix-RSS-expansion-scheme-for-GRE-header.patch 2021-11-30 16:50:06.110875878 +0100 @@ -1 +1 @@ -From a21d616b99ffc5810a4b5333e5efdf1ddff21405 Mon Sep 17 00:00:00 2001 +From 3f65b6101051deb4ad4a19a92c01044f8e52a145 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 205fe19cdd..43598f92ee 100644 +index 0805bdb8c9..eff0057a60 100644 @@ -23 +24 @@ -@@ -654,7 +654,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { +@@ -180,7 +180,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { @@ -27,6 +28,6 @@ -- .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, -+ .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, -+ MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6, - MLX5_EXPANSION_GRE_KEY, - MLX5_EXPANSION_MPLS), +- .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, ++ .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, ++ MLX5_EXPANSION_IPV4, + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_GRE_KEY, + MLX5_EXPANSION_MPLS),