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 A596AA0C47 for ; Mon, 26 Jul 2021 15:53:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99762410E1; Mon, 26 Jul 2021 15:53:54 +0200 (CEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 91ECA410EA for ; Mon, 26 Jul 2021 15:53:52 +0200 (CEST) Received: by mail-wr1-f47.google.com with SMTP id l4so11196244wrs.4 for ; Mon, 26 Jul 2021 06:53:52 -0700 (PDT) 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=eYD2+UsH+PTmkc7xbnTCPlvY0qStn4BRiEWXIVgBtms=; b=rGM5jC9PxkMxkqe6ooRluBdBefR3+1cOkS0WTrsaxLeoMdAjNi6QAFAyzLKusf6gzv u7WUYusZhAIX8jbtdc6p59Y/SdzQKUEKKVi8G8bAZvSc6feyxdShVVPDL1XzTXN79dPd g4O36aOPO5M/jed412fCy3eSqfuQMGN7mICPttxfRm8VGdHl9JuulnM2ZqCO9GxaUfBY TwOjEUiJQXfEzYocR0T3UcFvrRx8nBQ1WA3JTLk8cdy4Wbrc2eiEX5VduF615ZJdTJrI Mj+AlHdPEvF7lMGEvEeqfuhXjHRhrVLgmequGoFcCslG8zDYDbzmQQOopOwR/MYl+9h8 Y1OQ== 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=eYD2+UsH+PTmkc7xbnTCPlvY0qStn4BRiEWXIVgBtms=; b=V8ob5lLT5ZMqi/jKf4GsueOoI6rN/oLJPeYlfVA43BpODcnyJc+x6ayb9TxApR5cTr D0uu5bqawOphiquZWgDrvBLiMBTcxJlG8ubfPP274pv87Kh0x7MyWgcoUwg0f+j+Rswb bCCMlOwhjIqBP7NpvdpnmjFXn0AoYkrMZ3+1ueER/4rEW7OdutBNiJ013aJU4M+XWzFx OTsEnX1OPOJTE5q3cqabfMc9m1z5zTiIVYQ3JKL685d40G+o9ldnfJ1RkZocKQPIlS+g xFo2feWr3HFqF4ZcodIIbIpGx15jRd9NpvlmPbRrb30UpWFjUK/LrO11v3sFBEIcn5j/ Cb1g== X-Gm-Message-State: AOAM533NQkE2yvGfMMsfW2M5IIJaFa6NsHWj6rYSUI6ZqsubSD4wtbTF SSi63Q+FmUHueodwOtAaHpU= X-Google-Smtp-Source: ABdhPJwN4NW5pC9zXUMIa6BOHVhrm8W2Eu+oXiyRh2idjL2+CEvydsSLU29wQUMQ2b2tfCHGCDg5kw== X-Received: by 2002:a05:6000:1106:: with SMTP id z6mr9772321wrw.296.1627307632374; Mon, 26 Jul 2021 06:53:52 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id m21sm9513640wml.32.2021.07.26.06.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:53:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Mon, 26 Jul 2021 14:52:30 +0100 Message-Id: <20210726135322.149850-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix missing RSS expansion of IPv6 frag' has been queued to stable release 20.11.3 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.3 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/28/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/a6a787bf7d95934ac9c6ef2354efe885a10db690 Thanks. Luca Boccassi --- >From a6a787bf7d95934ac9c6ef2354efe885a10db690 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Wed, 7 Jul 2021 10:32:47 +0800 Subject: [PATCH] net/mlx5: fix missing RSS expansion of IPv6 frag [ upstream commit 0ed93c13449c0dfc41d957ae809aeceb70d001a3 ] IPV6_FRAG_EXT item is missed for RSS expansion which causes wrongly expanded flows: flow create 0 ingress pattern eth / ipv6 / udp dst is 250 / vxlan-gpe / ipv6 / ipv6_frag_ext / end actions rss level 2 types ip end / end Different from other items, IPV6_FRAG_EXT hasn't next field because HW only support to do hash of UDP/TCP for non-fragment. This MLX5_EXPANSION_IPV6_FRAG_EXT node in RSS expansion graph only helps RSS expansion function to locate right node in graph from which start to expand. Fixes: 0e5a0d8f7556 ("net/mlx5: support match on IPv6 fragment extension") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 709592b98e..4f5a0cf95c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -134,6 +134,7 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item) case RTE_FLOW_ITEM_TYPE_MPLS: case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: case RTE_FLOW_ITEM_TYPE_GRE_KEY: + case RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT: return true; default: break; @@ -453,6 +454,7 @@ enum mlx5_expansion { MLX5_EXPANSION_IPV6, MLX5_EXPANSION_IPV6_UDP, MLX5_EXPANSION_IPV6_TCP, + MLX5_EXPANSION_IPV6_FRAG_EXT, }; /** Supported expansion of items. */ @@ -607,7 +609,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_IPV6] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV6_UDP, - MLX5_EXPANSION_IPV6_TCP), + MLX5_EXPANSION_IPV6_TCP, + MLX5_EXPANSION_IPV6_FRAG_EXT), .type = RTE_FLOW_ITEM_TYPE_IPV6, .rss_types = ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 | ETH_RSS_NONFRAG_IPV6_OTHER, @@ -620,6 +623,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { .type = RTE_FLOW_ITEM_TYPE_TCP, .rss_types = ETH_RSS_NONFRAG_IPV6_TCP, }, + [MLX5_EXPANSION_IPV6_FRAG_EXT] = { + .type = RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT, + }, }; static struct rte_flow_shared_action * -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:16.307948456 +0100 +++ 0007-net-mlx5-fix-missing-RSS-expansion-of-IPv6-frag.patch 2021-07-26 13:53:15.797291529 +0100 @@ -1 +1 @@ -From 0ed93c13449c0dfc41d957ae809aeceb70d001a3 Mon Sep 17 00:00:00 2001 +From a6a787bf7d95934ac9c6ef2354efe885a10db690 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ed93c13449c0dfc41d957ae809aeceb70d001a3 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index f534bf7fa1..347e8c1a09 100644 +index 709592b98e..4f5a0cf95c 100644 @@ -66 +67 @@ - static struct rte_flow_action_handle * + static struct rte_flow_shared_action *