From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9096CC7EE23 for ; Thu, 2 Mar 2023 00:49:42 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BE4F42D3B; Thu, 2 Mar 2023 01:48:22 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 920A841156 for ; Thu, 2 Mar 2023 01:48:03 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 649B720BBF92; Wed, 1 Mar 2023 16:48:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 649B720BBF92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1677718082; bh=HY8ilW01qnKduRPYqlNbTXC0gqtafSQMDA2hCR+8S1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XvPZ5PcDqkJ56aQNj1pqaFgZG6bIaJrpxqsSVMhLfgGbJ5eUYZ3aexpOZumtOCO9T KcIQ9/Ip3Wco0SAm9Tk6RckSkKj3rOw+FBBBlnOEsxoQLM3whKpTqMlPNk5ZNiH+9Z BNIGirjsXqFiUWAVlDhiG3cvlqVViM+es8YKB8ek= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 10/17] net/mlx5: use previous value atomic fetch operations Date: Wed, 1 Mar 2023 16:47:41 -0800 Message-Id: <1677718068-2412-11-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1677718068-2412-1-git-send-email-roretzla@linux.microsoft.com> References: <1677718068-2412-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use __atomic_fetch_{add,and,or,sub,xor} instead of __atomic_{add,and,or,sub,xor}_fetch when we have no interest in the result of the operation. Reduces unnecessary codegen that provided the result of the atomic operation that was not used. Change brings closer alignment with atomics available in C11 standard and will reduce review effort when they are integrated. Signed-off-by: Tyler Retzlaff --- drivers/net/mlx5/linux/mlx5_verbs.c | 2 +- drivers/net/mlx5/mlx5_flow.c | 6 +++--- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- drivers/net/mlx5/mlx5_flow_flex.c | 6 +++--- drivers/net/mlx5/mlx5_flow_hw.c | 10 +++++----- drivers/net/mlx5/mlx5_flow_meter.c | 20 ++++++++++---------- drivers/net/mlx5/mlx5_rx.h | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c index 67a7bec..c722613 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -1159,7 +1159,7 @@ claim_zero(mlx5_glue->destroy_cq(sh->self_lb.ibv_cq)); sh->self_lb.ibv_cq = NULL; } - (void)__atomic_sub_fetch(&sh->self_lb.refcnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&sh->self_lb.refcnt, 1, __ATOMIC_RELAXED); return -rte_errno; #else RTE_SET_USED(dev); diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a6a426c..1c51b29 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -4451,7 +4451,7 @@ struct mlx5_translated_action_handle { shared_rss = mlx5_ipool_get (priv->sh->ipool[MLX5_IPOOL_RSS_SHARED_ACTIONS], idx); - __atomic_add_fetch(&shared_rss->refcnt, 1, + __atomic_fetch_add(&shared_rss->refcnt, 1, __ATOMIC_RELAXED); return idx; default: @@ -7295,7 +7295,7 @@ struct mlx5_list_entry * if (tunnel) { flow->tunnel = 1; flow->tunnel_id = tunnel->tunnel_id; - __atomic_add_fetch(&tunnel->refctn, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&tunnel->refctn, 1, __ATOMIC_RELAXED); mlx5_free(default_miss_ctx.queue); } mlx5_flow_pop_thread_workspace(); @@ -7306,7 +7306,7 @@ struct mlx5_list_entry * flow_mreg_del_copy_action(dev, flow); flow_drv_destroy(dev, flow); if (rss_desc->shared_rss) - __atomic_sub_fetch(&((struct mlx5_shared_action_rss *) + __atomic_fetch_sub(&((struct mlx5_shared_action_rss *) mlx5_ipool_get (priv->sh->ipool[MLX5_IPOOL_RSS_SHARED_ACTIONS], rss_desc->shared_rss))->refcnt, 1, __ATOMIC_RELAXED); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f93dd40..0233cde 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -15143,7 +15143,7 @@ struct mlx5_list_entry * shared_rss = mlx5_ipool_get (priv->sh->ipool[MLX5_IPOOL_RSS_SHARED_ACTIONS], srss); - __atomic_sub_fetch(&shared_rss->refcnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&shared_rss->refcnt, 1, __ATOMIC_RELAXED); } void @@ -15734,7 +15734,7 @@ struct mlx5_list_entry * /* Update queue with indirect table queue memoyr. */ origin->queue = shared_rss->ind_tbl->queues; rte_spinlock_init(&shared_rss->action_rss_sl); - __atomic_add_fetch(&shared_rss->refcnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&shared_rss->refcnt, 1, __ATOMIC_RELAXED); rte_spinlock_lock(&priv->shared_act_sl); ILIST_INSERT(priv->sh->ipool[MLX5_IPOOL_RSS_SHARED_ACTIONS], &priv->rss_shared_actions, idx, shared_rss, next); diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index 35f2a99..a825274 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -301,7 +301,7 @@ return ret; } if (acquire) - __atomic_add_fetch(&flex->refcnt, 1, __ATOMIC_RELEASE); + __atomic_fetch_add(&flex->refcnt, 1, __ATOMIC_RELEASE); return ret; } @@ -336,7 +336,7 @@ rte_errno = -EINVAL; return -EINVAL; } - __atomic_sub_fetch(&flex->refcnt, 1, __ATOMIC_RELEASE); + __atomic_fetch_sub(&flex->refcnt, 1, __ATOMIC_RELEASE); return 0; } @@ -1220,7 +1220,7 @@ struct rte_flow_item_flex_handle * } flex->devx_fp = container_of(ent, struct mlx5_flex_parser_devx, entry); /* Mark initialized flex item valid. */ - __atomic_add_fetch(&flex->refcnt, 1, __ATOMIC_RELEASE); + __atomic_fetch_add(&flex->refcnt, 1, __ATOMIC_RELEASE); return (struct rte_flow_item_flex_handle *)flex; error: diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a9c7045..159ebb5 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1406,7 +1406,7 @@ static rte_be32_t vlan_hdr_to_be32(const struct rte_flow_action *actions) goto err; acts->rule_acts[action_pos].action = priv->hw_tag[!!attr->group]; - __atomic_add_fetch(&priv->hws_mark_refcnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&priv->hws_mark_refcnt, 1, __ATOMIC_RELAXED); flow_hw_rxq_flag_set(dev, true); break; case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: @@ -3162,13 +3162,13 @@ static rte_be32_t vlan_hdr_to_be32(const struct rte_flow_action *actions) at_error: while (i--) { __flow_hw_action_template_destroy(dev, &tbl->ats[i].acts); - __atomic_sub_fetch(&action_templates[i]->refcnt, + __atomic_fetch_sub(&action_templates[i]->refcnt, 1, __ATOMIC_RELAXED); } i = nb_item_templates; it_error: while (i--) - __atomic_sub_fetch(&item_templates[i]->refcnt, + __atomic_fetch_sub(&item_templates[i]->refcnt, 1, __ATOMIC_RELAXED); error: err = rte_errno; @@ -3361,11 +3361,11 @@ static rte_be32_t vlan_hdr_to_be32(const struct rte_flow_action *actions) } LIST_REMOVE(table, next); for (i = 0; i < table->nb_item_templates; i++) - __atomic_sub_fetch(&table->its[i]->refcnt, + __atomic_fetch_sub(&table->its[i]->refcnt, 1, __ATOMIC_RELAXED); for (i = 0; i < table->nb_action_templates; i++) { __flow_hw_action_template_destroy(dev, &table->ats[i].acts); - __atomic_sub_fetch(&table->ats[i].action_template->refcnt, + __atomic_fetch_sub(&table->ats[i].action_template->refcnt, 1, __ATOMIC_RELAXED); } mlx5dr_matcher_destroy(table->matcher); diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 08f8aad..cb26a12 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1788,7 +1788,7 @@ struct mlx5_flow_meter_policy * NULL, "Meter profile id not valid."); /* Meter policy must exist. */ if (params->meter_policy_id == priv->sh->mtrmng->def_policy_id) { - __atomic_add_fetch + __atomic_fetch_add (&priv->sh->mtrmng->def_policy_ref_cnt, 1, __ATOMIC_RELAXED); domain_bitmap = MLX5_MTR_ALL_DOMAIN_BIT; @@ -1870,7 +1870,7 @@ struct mlx5_flow_meter_policy * fm->is_enable = params->meter_enable; fm->shared = !!shared; fm->color_aware = !!params->use_prev_mtr_color; - __atomic_add_fetch(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); if (params->meter_policy_id == priv->sh->mtrmng->def_policy_id) { fm->def_policy = 1; fm->flow_ipool = mlx5_ipool_create(&flow_ipool_cfg); @@ -1899,7 +1899,7 @@ struct mlx5_flow_meter_policy * } fm->active_state = params->meter_enable; if (mtr_policy) - __atomic_add_fetch(&mtr_policy->ref_cnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&mtr_policy->ref_cnt, 1, __ATOMIC_RELAXED); return 0; error: mlx5_flow_destroy_mtr_tbls(dev, fm); @@ -1994,8 +1994,8 @@ struct mlx5_flow_meter_policy * RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Failed to create devx meter."); fm->active_state = params->meter_enable; - __atomic_add_fetch(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); - __atomic_add_fetch(&policy->ref_cnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&policy->ref_cnt, 1, __ATOMIC_RELAXED); return 0; } @@ -2017,7 +2017,7 @@ struct mlx5_flow_meter_policy * if (fmp == NULL) return -1; /* Update dependencies. */ - __atomic_sub_fetch(&fmp->ref_cnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&fmp->ref_cnt, 1, __ATOMIC_RELAXED); fm->profile = NULL; /* Remove from list. */ if (!priv->sh->meter_aso_en) { @@ -2035,14 +2035,14 @@ struct mlx5_flow_meter_policy * } mlx5_flow_destroy_mtr_tbls(dev, fm); if (fm->def_policy) - __atomic_sub_fetch(&priv->sh->mtrmng->def_policy_ref_cnt, + __atomic_fetch_sub(&priv->sh->mtrmng->def_policy_ref_cnt, 1, __ATOMIC_RELAXED); if (priv->sh->meter_aso_en) { if (!fm->def_policy) { mtr_policy = mlx5_flow_meter_policy_find(dev, fm->policy_id, NULL); if (mtr_policy) - __atomic_sub_fetch(&mtr_policy->ref_cnt, + __atomic_fetch_sub(&mtr_policy->ref_cnt, 1, __ATOMIC_RELAXED); fm->policy_id = 0; } @@ -2146,12 +2146,12 @@ struct mlx5_flow_meter_policy * RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Meter object is being used."); /* Destroy the meter profile. */ - __atomic_sub_fetch(&fm->profile->ref_cnt, + __atomic_fetch_sub(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED); /* Destroy the meter policy. */ policy = mlx5_flow_meter_policy_find(dev, fm->policy_id, NULL); - __atomic_sub_fetch(&policy->ref_cnt, + __atomic_fetch_sub(&policy->ref_cnt, 1, __ATOMIC_RELAXED); memset(fm, 0, sizeof(struct mlx5_flow_meter_info)); return 0; diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index 6b42e27..ba62398 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -539,7 +539,7 @@ uint16_t mlx5_rx_burst_mprq_vec(void *dpdk_rxq, struct rte_mbuf **pkts, void *buf_addr; /* Increment the refcnt of the whole chunk. */ - __atomic_add_fetch(&buf->refcnt, 1, __ATOMIC_RELAXED); + __atomic_fetch_add(&buf->refcnt, 1, __ATOMIC_RELAXED); MLX5_ASSERT(__atomic_load_n(&buf->refcnt, __ATOMIC_RELAXED) <= strd_n + 1); buf_addr = RTE_PTR_SUB(addr, RTE_PKTMBUF_HEADROOM); -- 1.8.3.1