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 D9F33A04DD for ; Wed, 28 Oct 2020 11:47:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CFB4DCA12; Wed, 28 Oct 2020 11:47:24 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by dpdk.org (Postfix) with ESMTP id 78E512C2A for ; Wed, 28 Oct 2020 11:47:22 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id i1so5179775wro.1 for ; Wed, 28 Oct 2020 03:47:22 -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=L602AbJ8ayxmeTbwxJ5L8UuXB5pEqlTTj5e4XSqh6NQ=; b=B+gsyRx0DmqeZed6FvMxhTr931kpU4StDJE3DwRDYJoM9f1xTud2YcpFkj4iiv03Pk OfNw+LIU/rS933bkKE9wZgbhkws6GedQC+NQp2zLMarNSSHQ1imSa1Jpx5AQc8s0a5Jr 7aihj9/hXXa9aY/QVw5CRth/3n0r5viD/VaG9D5fiUtLMh07HqeTrOQsKfUOSMV1BrzN GYtyp+Y8zow65BSFLIbzE6FEwoA+VGmwIC+Y3fLGd2eYnRcv+eKw1fghz/kw7Ii7J1vL sDFkIvsMjXR00+RJDn9dEAZjiTE3XVKXI7BuOrV2KDdkkL9WjrnrkJ1LJiGd/r0+foJm n7+A== 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=L602AbJ8ayxmeTbwxJ5L8UuXB5pEqlTTj5e4XSqh6NQ=; b=FtL3Xabrvv8grGB9QH747Zrk1Q/1aALuqkSbY5w7PZponuFl24xwfxCNbj3/kRYetG EcRpZQmd38VxibN+a/q4HKdsWz4h71vt5ELSaHC3e4VaHPPqOlWaIZlnvv6wHO4TWHA5 5VhwGRjSpuLvZsQwWJRc+BKLg9gYZutjpdIjF5EPUoWGaOKAvVqDv+8HmVUtIOowQRl2 VOtUAk0RFlSnL6FxtOT1u6yb697t+9EDVWUviqmrB/Ksr8fQtNSVxfMq8UAnQMgB3LsW 7PyRmJ1jQ6GXT5L8HNJAo0chgdEzfuaeJdB3zQU1XnXNVRtfOho7CL5eMNY+LJIvugGF G+Rg== X-Gm-Message-State: AOAM531PTnQidVuV4GQxKWl2skg17f0pCv4g99g8fy2+s4UIRuIa7nz+ V0YCGuvGAn0SbmWMg9/0acA= X-Google-Smtp-Source: ABdhPJykGUGguFBMfzpNeX2oRwR3WrKKGLv/gGM3FFUQQkAEUFgkU8AxYGZ1T/JREWU6qzX0GjG/gQ== X-Received: by 2002:adf:f3c4:: with SMTP id g4mr8583965wrp.207.1603882042148; Wed, 28 Oct 2020 03:47:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d3sm5843477wre.91.2020.10.28.03.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Qi Zhang , dpdk stable Date: Wed, 28 Oct 2020 10:43:04 +0000 Message-Id: <20201028104606.3504127-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix flow validation for unsupported patterns' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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 5071c928825fa508c86ef6b96f6510974ac2ff3a Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 8 Sep 2020 03:15:05 +0000 Subject: [PATCH] net/ice: fix flow validation for unsupported patterns [ upstream commit c28c993c8a255b13cb0fb5f8094cebf46176ef1d ] When loading the OS default package and the pipeline mode is enabled by the "pipeline-mode-support=1" operation. In this case, the wrong parser is selected for processing and it will cause the unsupported patterns(pppoes/pfcp/l2tpv3/esp/ah) to be validated successfully. This patch corrects the parser selection issue. Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Guinan Sun Acked-by: Qi Zhang --- drivers/net/ice/ice_switch_filter.c | 100 ++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 19 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index c2f5aa78d5..03493ee464 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -98,12 +98,47 @@ struct sw_meta { static struct ice_flow_parser ice_switch_dist_parser_os; static struct ice_flow_parser ice_switch_dist_parser_comms; -static struct ice_flow_parser ice_switch_perm_parser; +static struct ice_flow_parser ice_switch_perm_parser_os; +static struct ice_flow_parser ice_switch_perm_parser_comms; + +static struct +ice_pattern_match_item ice_switch_pattern_dist_os[] = { + {pattern_ethertype, + ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, + {pattern_eth_ipv4, + ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp, + ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_ipv4_tcp, + ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_ipv6, + ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE}, + {pattern_eth_ipv6_udp, + ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE}, + {pattern_eth_ipv6_tcp, + ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4, + ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, + ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, + ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_ipv4_nvgre_eth_ipv4, + ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_nvgre_eth_ipv4_udp, + ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, +}; static struct ice_pattern_match_item ice_switch_pattern_dist_comms[] = { {pattern_ethertype, ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, {pattern_eth_ipv4, ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, {pattern_eth_ipv4_udp, @@ -139,7 +174,7 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = { }; static struct -ice_pattern_match_item ice_switch_pattern_dist_os[] = { +ice_pattern_match_item ice_switch_pattern_perm_os[] = { {pattern_ethertype, ICE_SW_INSET_ETHER, ICE_INSET_NONE}, {pattern_eth_arp, @@ -157,21 +192,25 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = { {pattern_eth_ipv6_tcp, ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4, - ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, - ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, - ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_nvgre_eth_ipv4, - ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE}, {pattern_eth_ipv4_nvgre_eth_ipv4_udp, - ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, - ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE}, }; static struct -ice_pattern_match_item ice_switch_pattern_perm[] = { +ice_pattern_match_item ice_switch_pattern_perm_comms[] = { + {pattern_ethertype, + ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, {pattern_eth_ipv4, ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, {pattern_eth_ipv4_udp, @@ -1215,7 +1254,7 @@ ice_switch_init(struct ice_adapter *ad) { int ret = 0; struct ice_flow_parser *dist_parser; - struct ice_flow_parser *perm_parser = &ice_switch_perm_parser; + struct ice_flow_parser *perm_parser; if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS) dist_parser = &ice_switch_dist_parser_comms; @@ -1224,10 +1263,16 @@ ice_switch_init(struct ice_adapter *ad) else return -EINVAL; - if (ad->devargs.pipe_mode_support) + if (ad->devargs.pipe_mode_support) { + if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS) + perm_parser = &ice_switch_perm_parser_comms; + else + perm_parser = &ice_switch_perm_parser_os; + ret = ice_register_parser(perm_parser, ad); - else + } else { ret = ice_register_parser(dist_parser, ad); + } return ret; } @@ -1235,17 +1280,25 @@ static void ice_switch_uninit(struct ice_adapter *ad) { struct ice_flow_parser *dist_parser; - struct ice_flow_parser *perm_parser = &ice_switch_perm_parser; + struct ice_flow_parser *perm_parser; if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS) dist_parser = &ice_switch_dist_parser_comms; - else + else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT) dist_parser = &ice_switch_dist_parser_os; + else + return; + + if (ad->devargs.pipe_mode_support) { + if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS) + perm_parser = &ice_switch_perm_parser_comms; + else + perm_parser = &ice_switch_perm_parser_os; - if (ad->devargs.pipe_mode_support) ice_unregister_parser(perm_parser, ad); - else + } else { ice_unregister_parser(dist_parser, ad); + } } static struct @@ -1278,10 +1331,19 @@ ice_flow_parser ice_switch_dist_parser_comms = { }; static struct -ice_flow_parser ice_switch_perm_parser = { +ice_flow_parser ice_switch_perm_parser_os = { .engine = &ice_switch_engine, - .array = ice_switch_pattern_perm, - .array_len = RTE_DIM(ice_switch_pattern_perm), + .array = ice_switch_pattern_perm_os, + .array_len = RTE_DIM(ice_switch_pattern_perm_os), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage = ICE_FLOW_STAGE_PERMISSION, +}; + +static struct +ice_flow_parser ice_switch_perm_parser_comms = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_perm_comms, + .array_len = RTE_DIM(ice_switch_pattern_perm_comms), .parse_pattern_action = ice_switch_parse_pattern_action, .stage = ICE_FLOW_STAGE_PERMISSION, }; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.572282725 +0000 +++ 0025-net-ice-fix-flow-validation-for-unsupported-patterns.patch 2020-10-28 10:35:11.452829258 +0000 @@ -1,8 +1,10 @@ -From c28c993c8a255b13cb0fb5f8094cebf46176ef1d Mon Sep 17 00:00:00 2001 +From 5071c928825fa508c86ef6b96f6510974ac2ff3a Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 8 Sep 2020 03:15:05 +0000 Subject: [PATCH] net/ice: fix flow validation for unsupported patterns +[ upstream commit c28c993c8a255b13cb0fb5f8094cebf46176ef1d ] + When loading the OS default package and the pipeline mode is enabled by the "pipeline-mode-support=1" operation. In this case, the wrong parser is selected for processing and it will cause the unsupported @@ -10,124 +12,29 @@ This patch corrects the parser selection issue. Fixes: 47d460d63233 ("net/ice: rework switch filter") -Cc: stable@dpdk.org Signed-off-by: Guinan Sun Acked-by: Qi Zhang --- - drivers/net/ice/ice_switch_filter.c | 258 +++++++++++++++++----------- - 1 file changed, 160 insertions(+), 98 deletions(-) + drivers/net/ice/ice_switch_filter.c | 100 ++++++++++++++++++++++------ + 1 file changed, 81 insertions(+), 19 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c -index 24320ac7df..4dfeeef50f 100644 +index c2f5aa78d5..03493ee464 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c -@@ -139,93 +139,8 @@ struct sw_meta { +@@ -98,12 +98,47 @@ struct sw_meta { static struct ice_flow_parser ice_switch_dist_parser_os; static struct ice_flow_parser ice_switch_dist_parser_comms; -static struct ice_flow_parser ice_switch_perm_parser; -- --static struct --ice_pattern_match_item ice_switch_pattern_dist_comms[] = { -- {pattern_ethertype, -- ICE_SW_INSET_ETHER, ICE_INSET_NONE}, -- {pattern_ethertype_vlan, -- ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE}, -- {pattern_eth_ipv4, -- ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, -- {pattern_eth_ipv4_udp, -- ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_tcp, -- ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE}, -- {pattern_eth_ipv6, -- ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE}, -- {pattern_eth_ipv6_udp, -- ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE}, -- {pattern_eth_ipv6_tcp, -- ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_udp_vxlan_eth_ipv4, -- ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE}, -- {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, -- ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, -- ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_nvgre_eth_ipv4, -- ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE}, -- {pattern_eth_ipv4_nvgre_eth_ipv4_udp, -- ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, -- ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, -- {pattern_eth_pppoes, -- ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes, -- ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, -- {pattern_eth_pppoes_proto, -- ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_proto, -- ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv4, -- ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv4_tcp, -- ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv4_udp, -- ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv6, -- ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv6_tcp, -- ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, -- {pattern_eth_pppoes_ipv6_udp, -- ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv4, -- ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv4_tcp, -- ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv4_udp, -- ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv6, -- ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv6_tcp, -- ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, -- {pattern_eth_vlan_pppoes_ipv6_udp, -- ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_esp, -- ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_udp_esp, -- ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, -- {pattern_eth_ipv6_esp, -- ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE}, -- {pattern_eth_ipv6_udp_esp, -- ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_ah, -- ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE}, -- {pattern_eth_ipv6_ah, -- ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE}, -- {pattern_eth_ipv6_udp_ah, -- ICE_INSET_NONE, ICE_INSET_NONE}, -- {pattern_eth_ipv4_l2tp, -- ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE}, -- {pattern_eth_ipv6_l2tp, -- ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE}, -- {pattern_eth_ipv4_pfcp, -- ICE_INSET_NONE, ICE_INSET_NONE}, -- {pattern_eth_ipv6_pfcp, -- ICE_INSET_NONE, ICE_INSET_NONE}, --}; +static struct ice_flow_parser ice_switch_perm_parser_os; +static struct ice_flow_parser ice_switch_perm_parser_comms; - - static struct - ice_pattern_match_item ice_switch_pattern_dist_os[] = { -@@ -262,11 +177,135 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = { - }; - - static struct --ice_pattern_match_item ice_switch_pattern_perm[] = { -+ice_pattern_match_item ice_switch_pattern_dist_comms[] = { - {pattern_ethertype, - ICE_SW_INSET_ETHER, ICE_INSET_NONE}, - {pattern_ethertype_vlan, - ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE}, ++ ++static struct ++ice_pattern_match_item ice_switch_pattern_dist_os[] = { ++ {pattern_ethertype, ++ ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, + {pattern_eth_ipv4, @@ -154,108 +61,60 @@ + ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, -+ {pattern_eth_pppoes, -+ ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes, -+ ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_proto, -+ ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_proto, -+ ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv4, -+ ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv4_tcp, -+ ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv4_udp, -+ ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv6, -+ ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv6_tcp, -+ ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, -+ {pattern_eth_pppoes_ipv6_udp, -+ ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv4, -+ ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv4_tcp, -+ ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv4_udp, -+ ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv6, -+ ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv6_tcp, -+ ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, -+ {pattern_eth_vlan_pppoes_ipv6_udp, -+ ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_esp, -+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_udp_esp, -+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_esp, -+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_udp_esp, -+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_ah, -+ ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_ah, -+ ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_udp_ah, -+ ICE_INSET_NONE, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_l2tp, -+ ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_l2tp, -+ ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_pfcp, -+ ICE_INSET_NONE, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_pfcp, -+ ICE_INSET_NONE, ICE_INSET_NONE}, +}; -+ -+static struct -+ice_pattern_match_item ice_switch_pattern_perm_os[] = { -+ {pattern_ethertype, -+ ICE_SW_INSET_ETHER, ICE_INSET_NONE}, -+ {pattern_ethertype_vlan, -+ ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE}, + + static struct + ice_pattern_match_item ice_switch_pattern_dist_comms[] = { + {pattern_ethertype, + ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, -+ {pattern_eth_ipv4, -+ ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_udp, -+ ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_tcp, -+ ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE}, -+ {pattern_eth_ipv6, -+ ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_udp, -+ ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE}, -+ {pattern_eth_ipv6_tcp, -+ ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4, + {pattern_eth_ipv4, + ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp, +@@ -139,7 +174,7 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = { + }; + + static struct +-ice_pattern_match_item ice_switch_pattern_dist_os[] = { ++ice_pattern_match_item ice_switch_pattern_perm_os[] = { + {pattern_ethertype, + ICE_SW_INSET_ETHER, ICE_INSET_NONE}, + {pattern_eth_arp, +@@ -157,21 +192,25 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = { + {pattern_eth_ipv6_tcp, + ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4, +- ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, +- ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, +- ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_nvgre_eth_ipv4, + {pattern_eth_ipv4_nvgre_eth_ipv4, +- ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_nvgre_eth_ipv4_udp, + {pattern_eth_ipv4_nvgre_eth_ipv4_udp, +- ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE}, -+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, +- ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE}, -+}; -+ -+static struct + }; + + static struct +-ice_pattern_match_item ice_switch_pattern_perm[] = { +ice_pattern_match_item ice_switch_pattern_perm_comms[] = { + {pattern_ethertype, + ICE_SW_INSET_ETHER, ICE_INSET_NONE}, -+ {pattern_ethertype_vlan, -+ ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE}, + {pattern_eth_arp, + ICE_INSET_NONE, ICE_INSET_NONE}, {pattern_eth_ipv4, ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE}, {pattern_eth_ipv4_udp, -@@ -1813,7 +1852,7 @@ ice_switch_init(struct ice_adapter *ad) +@@ -1215,7 +1254,7 @@ ice_switch_init(struct ice_adapter *ad) { int ret = 0; struct ice_flow_parser *dist_parser; @@ -264,7 +123,7 @@ if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS) dist_parser = &ice_switch_dist_parser_comms; -@@ -1822,10 +1861,16 @@ ice_switch_init(struct ice_adapter *ad) +@@ -1224,10 +1263,16 @@ ice_switch_init(struct ice_adapter *ad) else return -EINVAL; @@ -283,7 +142,7 @@ return ret; } -@@ -1833,17 +1878,25 @@ static void +@@ -1235,17 +1280,25 @@ static void ice_switch_uninit(struct ice_adapter *ad) { struct ice_flow_parser *dist_parser; @@ -313,7 +172,7 @@ } static struct -@@ -1877,10 +1930,19 @@ ice_flow_parser ice_switch_dist_parser_comms = { +@@ -1278,10 +1331,19 @@ ice_flow_parser ice_switch_dist_parser_comms = { }; static struct