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 69DC8A0547 for ; Tue, 9 Feb 2021 11:36:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6468B40147; Tue, 9 Feb 2021 11:36:28 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 71056160706 for ; Tue, 9 Feb 2021 11:36:25 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id g10so21020714wrx.1 for ; Tue, 09 Feb 2021 02:36:25 -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=PZGP1eZ+u6dtaAeqA6iRfEy4aZ67swUd0xbtiNYW62U=; b=hypw0tyo2+861Rliy3C+fS+cw60kf2F/PsGnAFFITCLMIr/ftTMAjK6xtW7v2I648n /psleViMLKu9YO+0ZUL/van1MLe+mKP0oyKJX8evm+s6xHUzE/Yz32ulEaP8NFgfxmdP XmhPZqufJepJ5BVlZgOanYe/nNXds1V8dDAMLZfoWcyl13y1tRgayULCxFraLtDUIozX VSTknzboM52o+Bwc/Q53SKF0pxa+wQEFGErKs4sgNi109BXRxTKkqFf0Y6PjwEwPPbfN RUvQtcT3soRbXXUKfuxsopS6WsJlWeOzBvQTLPouezHJAdaKjnZmFc3bbMLw08+79y30 N3GQ== 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=PZGP1eZ+u6dtaAeqA6iRfEy4aZ67swUd0xbtiNYW62U=; b=OFwT28v3rHgGXxn7bIVkHSjZO3aLECVk7vnsOzwdz7A5jmwva5MbIGF9+UOmIlY3O8 Tx+Ec7ZEUCYZO2JLuv+t5yKEJ9MMABes+QQatcJDvvCCXLxIaO4iqWRXcKtg258udSa4 iT2M+ycZqImGaeYRa5/IcJ6FUTknS8ZK5uyl6xynVSHbBXL5sbtDgx9uibZcTGiWBfGl 4J4HhhXyWP0ARfEGIfKAGlJFfTTqNTltTuejlEfq7OQXNvuMRI6RY4SvxEZDTqh5JiFY 10V/73WCLMT/583C2K1X2Y07gx7rbx2T7/3ZulslzIezkRRft0xKlxcNLVDb8qT+qOno mqbA== X-Gm-Message-State: AOAM5311PmLbWBHZwHkc1wHD42l7uQ6ji+7Rs31m3/HxKTUX66gIlZJe JFn9upd1eA7pWKGe7ZylMSEgL9WcrNr+Iw== X-Google-Smtp-Source: ABdhPJyuwC6ju/2yfspXuZ2rN4HUaWd5RFuddCazukxiN92GVDerD32uNjSSBeZZkDnPOkFl1dsCSQ== X-Received: by 2002:adf:ea87:: with SMTP id s7mr10672455wrm.217.1612866985248; Tue, 09 Feb 2021 02:36:25 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c62sm4017175wmd.43.2021.02.09.02.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 02:36:24 -0800 (PST) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Lijun Ou , dpdk stable Date: Tue, 9 Feb 2021 10:35:15 +0000 Message-Id: <20210209103529.466775-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210209103529.466775-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> <20210209103529.466775-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: remove MPLS from supported flow items' 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/11/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/5e0908d617a4393ee8210b46ee8346388802a723 Thanks. Luca Boccassi --- >From 5e0908d617a4393ee8210b46ee8346388802a723 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 3 Feb 2021 20:23:51 +0800 Subject: [PATCH] net/hns3: remove MPLS from supported flow items [ upstream commit e9550856f8c65b6e15f8f59810560bc6d240a1f8 ] The Kunpeng920 and Kunpeng930 don't support parse MPLS packet, so remove the type from supported flow items. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Lijun Ou --- drivers/net/hns3/hns3_flow.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 5f5e2b0128..d1bf9832a9 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -44,8 +44,7 @@ static enum rte_flow_item_type first_items[] = { RTE_FLOW_ITEM_TYPE_NVGRE, RTE_FLOW_ITEM_TYPE_VXLAN, RTE_FLOW_ITEM_TYPE_GENEVE, - RTE_FLOW_ITEM_TYPE_VXLAN_GPE, - RTE_FLOW_ITEM_TYPE_MPLS + RTE_FLOW_ITEM_TYPE_VXLAN_GPE }; static enum rte_flow_item_type L2_next_items[] = { @@ -65,8 +64,7 @@ static enum rte_flow_item_type L3_next_items[] = { static enum rte_flow_item_type L4_next_items[] = { RTE_FLOW_ITEM_TYPE_VXLAN, RTE_FLOW_ITEM_TYPE_GENEVE, - RTE_FLOW_ITEM_TYPE_VXLAN_GPE, - RTE_FLOW_ITEM_TYPE_MPLS + RTE_FLOW_ITEM_TYPE_VXLAN_GPE }; static enum rte_flow_item_type tunnel_next_items[] = { @@ -1145,8 +1143,7 @@ is_tunnel_packet(enum rte_flow_item_type type) if (type == RTE_FLOW_ITEM_TYPE_VXLAN_GPE || type == RTE_FLOW_ITEM_TYPE_VXLAN || type == RTE_FLOW_ITEM_TYPE_NVGRE || - type == RTE_FLOW_ITEM_TYPE_GENEVE || - type == RTE_FLOW_ITEM_TYPE_MPLS) + type == RTE_FLOW_ITEM_TYPE_GENEVE) return true; return false; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-09 10:34:58.615202798 +0000 +++ 0017-net-hns3-remove-MPLS-from-supported-flow-items.patch 2021-02-09 10:34:57.910584004 +0000 @@ -1 +1 @@ -From e9550856f8c65b6e15f8f59810560bc6d240a1f8 Mon Sep 17 00:00:00 2001 +From 5e0908d617a4393ee8210b46ee8346388802a723 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e9550856f8c65b6e15f8f59810560bc6d240a1f8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index a6011245c5..c484114b32 100644 +index 5f5e2b0128..d1bf9832a9 100644 @@ -42 +43 @@ -@@ -1118,8 +1116,7 @@ is_tunnel_packet(enum rte_flow_item_type type) +@@ -1145,8 +1143,7 @@ is_tunnel_packet(enum rte_flow_item_type type)