From patchwork Mon Mar 30 17:38:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 67407 X-Patchwork-Delegate: xiaolong.ye@intel.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 EF603A0562; Mon, 30 Mar 2020 10:42:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5C2DE1C068; Mon, 30 Mar 2020 10:42:52 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 7C6AB1C02A for ; Mon, 30 Mar 2020 10:42:49 +0200 (CEST) IronPort-SDR: mXGqCdnVTbQDLFrW1VATZ0GXBHiQTEPVd3QU4u0/6lmd4fpVVbtMyGvXeAcKO7UXWk0Ho4FaDI TMUNhDzK6VWA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 01:42:49 -0700 IronPort-SDR: q4bBqP2RY7PdilRDnCyuxCNGop58VCcwAG+2fiJAgZuhNR0ELV3kgvoldpyV9SzMnE6u1V2z8u GNp2VwY/92fw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="421861535" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.206]) by orsmga005.jf.intel.com with ESMTP; 30 Mar 2020 01:42:47 -0700 From: Beilei Xing To: dev@dpdk.org, haiyue.wang@intel.com, qiming.yang@intel.com, qi.z.zhang@intel.com Date: Tue, 31 Mar 2020 01:38:52 +0800 Message-Id: <1585589933-4247-2-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585589933-4247-1-git-send-email-beilei.xing@intel.com> References: <1585586271-9296-1-git-send-email-beilei.xing@intel.com> <1585589933-4247-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] net/ice: support flow redirect 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" Add a new ops "redirect" to flow engine, it's used to implement the function that redirect a flow's destination. Currently only support VSI-Redirect which will be used by DCF for handling VF-VSI mapping table change. A new API "ice_flow_redirect" is exposed, current usage is: it could be called when there's VF-VSI mapping table change caused by VF reset. Signed-off-by: Beilei Xing Signed-off-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 22 ++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 21 +++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index a1648ee..823ff0e 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1961,3 +1961,25 @@ ice_flow_query(struct rte_eth_dev *dev, } return ret; } + +int +ice_flow_redirect(struct ice_adapter *ad, + struct ice_flow_redirect *rd) +{ + struct ice_pf *pf = &ad->pf; + struct rte_flow *p_flow; + void *temp; + int ret; + + TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { + if (!p_flow->engine->redirect) + continue; + ret = p_flow->engine->redirect(ad, p_flow, rd); + if (ret) { + PMD_DRV_LOG(ERR, "Failed to redirect flows"); + return ret; + } + } + + return 0; +} diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h index adc30ee..ede6ec8 100644 --- a/drivers/net/ice/ice_generic_flow.h +++ b/drivers/net/ice/ice_generic_flow.h @@ -417,6 +417,20 @@ struct ice_pattern_match_item { void *meta; }; +enum ice_flow_redirect_type { + ICE_FLOW_REDIRECT_VSI, +}; + +struct ice_flow_redirect { + enum ice_flow_redirect_type type; + union { + struct { + uint16_t vsi_handle; + uint16_t new_vsi_num; + }; + }; +}; + typedef int (*engine_init_t)(struct ice_adapter *ad); typedef void (*engine_uninit_t)(struct ice_adapter *ad); typedef int (*engine_create_t)(struct ice_adapter *ad, @@ -430,6 +444,9 @@ typedef int (*engine_query_t)(struct ice_adapter *ad, struct rte_flow *flow, struct rte_flow_query_count *count, struct rte_flow_error *error); +typedef int(*engine_redirect_t)(struct ice_adapter *ad, + struct rte_flow *flow, + struct ice_flow_redirect *redirect); typedef void (*engine_free_t) (struct rte_flow *flow); typedef int (*parse_pattern_action_t)(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -447,6 +464,7 @@ struct ice_flow_engine { engine_create_t create; engine_destroy_t destroy; engine_query_t query_count; + engine_redirect_t redirect; engine_free_t free; enum ice_flow_engine_type type; }; @@ -485,4 +503,7 @@ ice_search_pattern_match_item(const struct rte_flow_item pattern[], struct ice_pattern_match_item *array, uint32_t array_len, struct rte_flow_error *error); +int +ice_flow_redirect(struct ice_adapter *ad, + struct ice_flow_redirect *rd); #endif From patchwork Mon Mar 30 17:38:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 67408 X-Patchwork-Delegate: xiaolong.ye@intel.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 A1A34A0562; Mon, 30 Mar 2020 10:43:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF7BE1C08D; Mon, 30 Mar 2020 10:42:53 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id B6DDA1C065 for ; Mon, 30 Mar 2020 10:42:50 +0200 (CEST) IronPort-SDR: UGuWYsOhMYvVR6vHHZNYU1yt7JhIM0LL584i/crfBMrFkhl3oqhn10rpSB9ONJG4QEweJMHrtk 1GpHP9uR+bTg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 01:42:50 -0700 IronPort-SDR: MI6+I0VMz7wXoGO/J1rKCIau30oW2XcntegEykRAO4Nr79JSwVDwBFmbj6Nw38UgKFT7tpisKj Wx3vApYQr5eA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="421861551" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.206]) by orsmga005.jf.intel.com with ESMTP; 30 Mar 2020 01:42:48 -0700 From: Beilei Xing To: dev@dpdk.org, haiyue.wang@intel.com, qiming.yang@intel.com, qi.z.zhang@intel.com Date: Tue, 31 Mar 2020 01:38:53 +0800 Message-Id: <1585589933-4247-3-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585589933-4247-1-git-send-email-beilei.xing@intel.com> References: <1585586271-9296-1-git-send-email-beilei.xing@intel.com> <1585589933-4247-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH v2 2/2] net/ice: support flow ops thread safe 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" For DCF, flow ops may be executed in different threads, so an thread safe option for generic flow APIs is needed. Signed-off-by: Beilei Xing Signed-off-by: Qi Zhang --- drivers/net/ice/ice_ethdev.h | 1 + drivers/net/ice/ice_generic_flow.c | 35 +++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 7b94a3c..f88f9dd 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -384,6 +384,7 @@ struct ice_pf { bool offset_loaded; bool adapter_stopped; struct ice_flow_list flow_list; + rte_spinlock_t flow_ops_lock; struct ice_parser_list rss_parser_list; struct ice_parser_list perm_parser_list; struct ice_parser_list dist_parser_list; diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 823ff0e..c042079 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1395,6 +1395,7 @@ ice_flow_init(struct ice_adapter *ad) TAILQ_INIT(&pf->rss_parser_list); TAILQ_INIT(&pf->perm_parser_list); TAILQ_INIT(&pf->dist_parser_list); + rte_spinlock_init(&pf->flow_ops_lock); TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { if (engine->init == NULL) { @@ -1862,19 +1863,24 @@ ice_flow_create(struct rte_eth_dev *dev, return flow; } + rte_spinlock_lock(&pf->flow_ops_lock); + ret = ice_flow_process_filter(dev, flow, attr, pattern, actions, &engine, ice_parse_engine_create, error); - if (ret < 0) - goto free_flow; + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to create flow"); + rte_free(flow); + flow = NULL; + goto out; + } + flow->engine = engine; TAILQ_INSERT_TAIL(&pf->flow_list, flow, node); PMD_DRV_LOG(INFO, "Succeeded to create (%d) flow", engine->type); - return flow; -free_flow: - PMD_DRV_LOG(ERR, "Failed to create flow"); - rte_free(flow); - return NULL; +out: + rte_spinlock_unlock(&pf->flow_ops_lock); + return flow; } static int @@ -1894,8 +1900,9 @@ ice_flow_destroy(struct rte_eth_dev *dev, return -rte_errno; } - ret = flow->engine->destroy(ad, flow, error); + rte_spinlock_lock(&pf->flow_ops_lock); + ret = flow->engine->destroy(ad, flow, error); if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); rte_free(flow); @@ -1903,6 +1910,8 @@ ice_flow_destroy(struct rte_eth_dev *dev, PMD_DRV_LOG(ERR, "Failed to destroy flow"); } + rte_spinlock_unlock(&pf->flow_ops_lock); + return ret; } @@ -1937,6 +1946,7 @@ ice_flow_query(struct rte_eth_dev *dev, struct ice_adapter *ad = ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct rte_flow_query_count *count = data; + struct ice_pf *pf = &ad->pf; if (!flow || !flow->engine || !flow->engine->query_count) { rte_flow_error_set(error, EINVAL, @@ -1945,6 +1955,8 @@ ice_flow_query(struct rte_eth_dev *dev, return -rte_errno; } + rte_spinlock_lock(&pf->flow_ops_lock); + for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { switch (actions->type) { case RTE_FLOW_ACTION_TYPE_VOID: @@ -1959,6 +1971,9 @@ ice_flow_query(struct rte_eth_dev *dev, "action not supported"); } } + + rte_spinlock_unlock(&pf->flow_ops_lock); + return ret; } @@ -1971,6 +1986,8 @@ ice_flow_redirect(struct ice_adapter *ad, void *temp; int ret; + rte_spinlock_lock(&pf->flow_ops_lock); + TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { if (!p_flow->engine->redirect) continue; @@ -1981,5 +1998,7 @@ ice_flow_redirect(struct ice_adapter *ad, } } + rte_spinlock_unlock(&pf->flow_ops_lock); + return 0; }