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 35D40A057B; Wed, 15 Apr 2020 03:08:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 176B41D443; Wed, 15 Apr 2020 03:08:42 +0200 (CEST) Received: from rcdn-iport-4.cisco.com (rcdn-iport-4.cisco.com [173.37.86.75]) by dpdk.org (Postfix) with ESMTP id 34ED41D429 for ; Wed, 15 Apr 2020 03:08:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1562; q=dns/txt; s=iport; t=1586912920; x=1588122520; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lR0hZzXnnt6aUYXnRaievO7scrbnthEG+JyBKc8cA6s=; b=k6xomg/6XfT5yoI0P5pPbTBJKocZuOQhJCUcdh5hUu5xLkJJ2TzvpVBy lEXHg81xbVFPmK2H8TQBM+8OCAytJECgmRH/uPVReugklmgRkh4KZJCSj SiiHNJ4zS+L2UHRFadUNGrTjz6s7Hr/cUK+epU7hz/ozVhB9FZqYL4fB0 E=; X-IronPort-AV: E=Sophos;i="5.72,385,1580774400"; d="scan'208";a="749610061" Received: from alln-core-10.cisco.com ([173.36.13.132]) by rcdn-iport-4.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 15 Apr 2020 01:08:39 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by alln-core-10.cisco.com (8.15.2/8.15.2) with ESMTP id 03F18cdM032055; Wed, 15 Apr 2020 01:08:39 GMT Received: by cisco.com (Postfix, from userid 392789) id ABDD620F2003; Tue, 14 Apr 2020 18:08:38 -0700 (PDT) From: John Daley To: ferruh.yigit@intel.com, arybchenko@solarflare.com Cc: dev@dpdk.org, John Daley , Hyong Youb Kim Date: Tue, 14 Apr 2020 18:06:41 -0700 Message-Id: <20200415010641.5195-5-johndale@cisco.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200415010641.5195-1-johndale@cisco.com> References: <20200415010641.5195-1-johndale@cisco.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Outbound-SMTP-Client: 10.193.184.48, savbu-usnic-a.cisco.com X-Outbound-Node: alln-core-10.cisco.com Subject: [dpdk-dev] [PATCH 5/5] net/enic: allow multiple mark and flag 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" 1400 series adapters support multiple MARK and FLAG action types. e.g.: mark id 10 / queue index 2 / mark id 11 / queue index 3 Remove the restriction in the Flow Manager implementation. Signed-off-by: John Daley Reviewed-by: Hyong Youb Kim --- drivers/net/enic/enic_fm_flow.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c index 86efeffc64..6ee0224372 100644 --- a/drivers/net/enic/enic_fm_flow.c +++ b/drivers/net/enic/enic_fm_flow.c @@ -1086,11 +1086,10 @@ enic_fm_copy_action(struct enic_flowman *fm, { enum { FATE = 1 << 0, - MARK = 1 << 1, + DECAP = 1 << 1, PASSTHRU = 1 << 2, COUNT = 1 << 3, ENCAP = 1 << 4, - DECAP = 1 << 5, }; struct fm_tcam_match_entry *fmt; struct fm_action_op fm_op; @@ -1141,9 +1140,6 @@ enic_fm_copy_action(struct enic_flowman *fm, const struct rte_flow_action_mark *mark = actions->conf; - if (overlap & MARK) - goto unsupported; - overlap |= MARK; if (mark->id >= ENIC_MAGIC_FILTER_ID - 1) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, @@ -1157,9 +1153,6 @@ enic_fm_copy_action(struct enic_flowman *fm, break; } case RTE_FLOW_ACTION_TYPE_FLAG: { - if (overlap & MARK) - goto unsupported; - overlap |= MARK; /* ENIC_MAGIC_FILTER_ID is reserved for flagging */ memset(&fm_op, 0, sizeof(fm_op)); fm_op.fa_op = FMOP_MARK; -- 2.22.0