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 E243DA0562; Mon, 30 Mar 2020 09:47:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ACF931C02A; Mon, 30 Mar 2020 09:47:48 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id C6C9DF12 for ; Mon, 30 Mar 2020 09:47:46 +0200 (CEST) IronPort-SDR: 7NosAD5TOgdcyzFtiEzsdyXVmf/l3kZKXgNGDYrPQmyFiA+B2hm6F6YZQGJtYV2sOw2ZyuzNP1 jrc+6S6j8ICA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 00:47:45 -0700 IronPort-SDR: kNGrHpdaB59PuKA5svW9dY2YbHA3hJZfO72G1VhscmVoAxs56sVXYP4ZdWEQw850/vqXe4bH96 012SVn2iBftg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="327672406" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.206]) by orsmga001.jf.intel.com with ESMTP; 30 Mar 2020 00:47:42 -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 00:42:50 +0800 Message-Id: <1585586570-9956-1-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] 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; } -- 2.7.4