From patchwork Fri Jul 3 02:23:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hyong Youb Kim (hyonkim)" X-Patchwork-Id: 72919 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42BDBA0519; Fri, 3 Jul 2020 04:24:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 27BC81D8F4; Fri, 3 Jul 2020 04:24:18 +0200 (CEST) Received: from rcdn-iport-3.cisco.com (rcdn-iport-3.cisco.com [173.37.86.74]) by dpdk.org (Postfix) with ESMTP id 7BA8B1D69F for ; Fri, 3 Jul 2020 04:24:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=4255; q=dns/txt; s=iport; t=1593743056; x=1594952656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A3gL6V1BujUt9LMSmFQKjcA/ob7+mEp7GnBdzjluuX4=; b=UGBakyJF7CO26wTFBHmYhW5mSc+ItVXvOwzcJTIwsIejSU9F5EyseK5g LCScKbMwUDlkd0DJN1Fg0GdojGEKg1dxxzvns9LO3gNFueLt2hxDoB0cO /UGVTYnfhYOJ87EzNXB+LR1Qt1WsXhhLjiSs+iGDetiUmkzlcyonAts6e c=; X-IronPort-AV: E=Sophos;i="5.75,306,1589241600"; d="scan'208";a="776789541" Received: from rcdn-core-10.cisco.com ([173.37.93.146]) by rcdn-iport-3.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 03 Jul 2020 02:24:16 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by rcdn-core-10.cisco.com (8.15.2/8.15.2) with ESMTP id 0632OFpL028923; Fri, 3 Jul 2020 02:24:15 GMT Received: by cisco.com (Postfix, from userid 508933) id 790A220F2005; Thu, 2 Jul 2020 19:24:15 -0700 (PDT) From: Hyong Youb Kim To: Ferruh Yigit Cc: dev@dpdk.org, Hyong Youb Kim , John Daley Date: Thu, 2 Jul 2020 19:23:50 -0700 Message-Id: <20200703022351.17172-2-hyonkim@cisco.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703022351.17172-1-hyonkim@cisco.com> References: <20200703022351.17172-1-hyonkim@cisco.com> MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.193.184.48, savbu-usnic-a.cisco.com X-Outbound-Node: rcdn-core-10.cisco.com Subject: [dpdk-dev] [PATCH 1/2] net/enic: support VLAN push and pop flow actions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Flow manager API includes push/pop actions, so support corresponding DPDK flow actions. Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- doc/guides/rel_notes/release_20_08.rst | 3 ++ drivers/net/enic/enic_fm_flow.c | 61 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index ccda17fb6a..b394381961 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -91,6 +91,9 @@ New Features which are used to access packet data in a safe manner. Currently JIT support for these instructions is implemented for x86 only. +* **Updated Cisco enic driver.** + + * Added support for VLAN push and pop flow actions. Removed Items ------------- diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c index 6ee0224372..10e5bb3d29 100644 --- a/drivers/net/enic/enic_fm_flow.c +++ b/drivers/net/enic/enic_fm_flow.c @@ -193,6 +193,7 @@ static const enum rte_flow_action_type enic_fm_supported_ig_actions[] = { RTE_FLOW_ACTION_TYPE_FLAG, RTE_FLOW_ACTION_TYPE_JUMP, RTE_FLOW_ACTION_TYPE_MARK, + RTE_FLOW_ACTION_TYPE_OF_POP_VLAN, RTE_FLOW_ACTION_TYPE_PORT_ID, RTE_FLOW_ACTION_TYPE_PASSTHRU, RTE_FLOW_ACTION_TYPE_QUEUE, @@ -208,6 +209,9 @@ static const enum rte_flow_action_type enic_fm_supported_eg_actions[] = { RTE_FLOW_ACTION_TYPE_COUNT, RTE_FLOW_ACTION_TYPE_DROP, RTE_FLOW_ACTION_TYPE_JUMP, + RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN, + RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP, + RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID, RTE_FLOW_ACTION_TYPE_PASSTHRU, RTE_FLOW_ACTION_TYPE_VOID, RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP, @@ -1090,17 +1094,22 @@ enic_fm_copy_action(struct enic_flowman *fm, PASSTHRU = 1 << 2, COUNT = 1 << 3, ENCAP = 1 << 4, + PUSH_VLAN = 1 << 5, }; struct fm_tcam_match_entry *fmt; struct fm_action_op fm_op; + bool need_ovlan_action; struct enic *enic; uint32_t overlap; uint64_t vnic_h; + uint16_t ovlan; bool first_rq; int ret; ENICPMD_FUNC_TRACE(); fmt = &fm->tcam_entry; + need_ovlan_action = false; + ovlan = 0; first_rq = true; enic = fm->enic; overlap = 0; @@ -1307,6 +1316,50 @@ enic_fm_copy_action(struct enic_flowman *fm, return ret; break; } + case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: { + memset(&fm_op, 0, sizeof(fm_op)); + fm_op.fa_op = FMOP_POP_VLAN; + ret = enic_fm_append_action_op(fm, &fm_op, error); + if (ret) + return ret; + break; + } + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: { + const struct rte_flow_action_of_push_vlan *vlan; + + if (overlap & PASSTHRU) + goto unsupported; + vlan = actions->conf; + if (vlan->ethertype != RTE_BE16(RTE_ETHER_TYPE_VLAN)) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "unexpected push_vlan ethertype"); + } + overlap |= PUSH_VLAN; + need_ovlan_action = true; + break; + } + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP: { + const struct rte_flow_action_of_set_vlan_pcp *pcp; + + pcp = actions->conf; + if (pcp->vlan_pcp > 7) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "invalid vlan_pcp"); + } + need_ovlan_action = true; + ovlan |= ((uint16_t)pcp->vlan_pcp) << 13; + break; + } + case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: { + const struct rte_flow_action_of_set_vlan_vid *vid; + + vid = actions->conf; + need_ovlan_action = true; + ovlan |= rte_be_to_cpu_16(vid->vlan_vid); + break; + } default: goto unsupported; } @@ -1314,6 +1367,14 @@ enic_fm_copy_action(struct enic_flowman *fm, if (!(overlap & (FATE | PASSTHRU | COUNT))) goto unsupported; + if (need_ovlan_action) { + memset(&fm_op, 0, sizeof(fm_op)); + fm_op.fa_op = FMOP_SET_OVLAN; + fm_op.ovlan.vlan = ovlan; + ret = enic_fm_append_action_op(fm, &fm_op, error); + if (ret) + return ret; + } memset(&fm_op, 0, sizeof(fm_op)); fm_op.fa_op = FMOP_END; ret = enic_fm_append_action_op(fm, &fm_op, error); From patchwork Fri Jul 3 02:23:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hyong Youb Kim (hyonkim)" X-Patchwork-Id: 72920 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A3D60A0519; Fri, 3 Jul 2020 04:24:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 87CEC1D6CF; Fri, 3 Jul 2020 04:24:54 +0200 (CEST) Received: from alln-iport-7.cisco.com (alln-iport-7.cisco.com [173.37.142.94]) by dpdk.org (Postfix) with ESMTP id 572E91D69F for ; Fri, 3 Jul 2020 04:24:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1109; q=dns/txt; s=iport; t=1593743092; x=1594952692; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hyJf53lnQGRujbOeo390tFIRp6saVBDTe/NxTlqZ7Uo=; b=mYbAn11S+3cfSEmUMxHQEL0vCFOXIjDPPfQVJ57V6/GkUXVequWBQslG hSD5gcnJcXDix5wBRLAv4AQ3Qe5oRULGS83TPP8WF6mtSmrU9AB53faVo FXmfd7u47lMbdmQxXB01JTbWS+qe+qhr8HrhEzLh/FOOwbxOpJr5sTfSc M=; X-IronPort-AV: E=Sophos;i="5.75,306,1589241600"; d="scan'208";a="507015412" Received: from rcdn-core-9.cisco.com ([173.37.93.145]) by alln-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 03 Jul 2020 02:24:51 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by rcdn-core-9.cisco.com (8.15.2/8.15.2) with ESMTP id 0632OoJY027192; Fri, 3 Jul 2020 02:24:51 GMT Received: by cisco.com (Postfix, from userid 508933) id D9C2F20F2005; Thu, 2 Jul 2020 19:24:50 -0700 (PDT) From: Hyong Youb Kim To: Ferruh Yigit Cc: dev@dpdk.org, Hyong Youb Kim , John Daley Date: Thu, 2 Jul 2020 19:23:51 -0700 Message-Id: <20200703022351.17172-3-hyonkim@cisco.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200703022351.17172-1-hyonkim@cisco.com> References: <20200703022351.17172-1-hyonkim@cisco.com> MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.193.184.48, savbu-usnic-a.cisco.com X-Outbound-Node: rcdn-core-9.cisco.com Subject: [dpdk-dev] [PATCH 2/2] net/enic: add new flow manager actions to the dump function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The following commit introduced several new actions. Make the dump function to print those actions. commit 6faf81f1d2c3 ("net/enic: update flow manager API") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/enic_fm_flow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c index 10e5bb3d29..cb08a9317f 100644 --- a/drivers/net/enic/enic_fm_flow.c +++ b/drivers/net/enic/enic_fm_flow.c @@ -1421,6 +1421,13 @@ enic_fm_dump_tcam_actions(const struct fm_action *fm_action) [FMOP_ENCAP] = "encap", [FMOP_SET_OVLAN] = "set_ovlan", [FMOP_DECAP_NOSTRIP] = "decap_nostrip", + [FMOP_DECAP_STRIP] = "decap_strip", + [FMOP_POP_VLAN] = "pop_vlan", + [FMOP_SET_EGPORT] = "set_egport", + [FMOP_RQ_STEER_ONLY] = "rq_steer_only", + [FMOP_SET_ENCAP_VLAN] = "set_encap_vlan", + [FMOP_EMIT] = "emit", + [FMOP_MODIFY] = "modify", }; const struct fm_action_op *op = &fm_action->fma_action_ops[0]; char buf[128], *bp = buf;