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 2EE53A09EF; Mon, 21 Dec 2020 07:57:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8FEFACCA7; Mon, 21 Dec 2020 07:56:23 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 0CF75CC43 for ; Mon, 21 Dec 2020 07:56:18 +0100 (CET) IronPort-SDR: BMb9btgvRtaPmctUAWU/21ZC8olnPYs/yTfUvh61+UOID46ezjQMbTNluvW86RjKsYTvCdE7ru Nwul2rcEtKjg== X-IronPort-AV: E=McAfee;i="6000,8403,9841"; a="237252419" X-IronPort-AV: E=Sophos;i="5.78,436,1599548400"; d="scan'208";a="237252419" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2020 22:56:18 -0800 IronPort-SDR: pK8MeE9omvTRJ80kDCnI3x1satu+krGtSza0NFR+TeFXLHfk+FgP6UjC3w4dP/2OyTFTECSmYE ezjRnJWS4gYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,436,1599548400"; d="scan'208";a="456007074" Received: from dpdk-zhirun-dev.sh.intel.com ([10.67.118.176]) by fmsmga001.fm.intel.com with ESMTP; 20 Dec 2020 22:56:16 -0800 From: Zhirun Yan To: dev@dpdk.org, qi.z.zhang@intel.com, yahui.cao@intel.com, xiao.w.wang@intel.com, junfeng.guo@intel.com Cc: simei.su@intel.com, ting.xu@intel.com, yuying.zhang@intel.com, Zhirun Yan Date: Mon, 21 Dec 2020 14:51:49 +0800 Message-Id: <20201221065150.1600719-5-zhirun.yan@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201221065150.1600719-1-zhirun.yan@intel.com> References: <20201221065150.1600719-1-zhirun.yan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v1 4/5] net/ice: add outer input set mask check 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" Distinguish input set mask for inner/outer. Add outer input set mask check. Signed-off-by: Zhirun Yan --- drivers/net/ice/ice_fdir_filter.c | 3 ++- drivers/net/ice/ice_generic_flow.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 76e0a8df38..2d2b261368 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -2020,7 +2020,8 @@ ice_fdir_parse(struct ice_adapter *ad, if (ret) goto error; input_set = filter->input_set | filter->outer_input_set; - if (!input_set || input_set & ~item->input_set_mask) { + if (!input_set || filter->input_set & ~item->input_set_mask || + filter->outer_input_set & ~item->input_set_mask_f) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, pattern, diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 1429cbc3b6..6c20b070c7 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -2088,6 +2088,8 @@ ice_search_pattern_match_item(const struct rte_flow_item pattern[], items)) { pattern_match_item->input_set_mask = array[i].input_set_mask; + pattern_match_item->input_set_mask_f = + array[i].input_set_mask_f; pattern_match_item->pattern_list = array[i].pattern_list; pattern_match_item->meta = array[i].meta; -- 2.25.1