From cac2a49b4ae5e24078b43b2f8b7cd083f74620b9 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Wed, 7 Jul 2021 13:48:38 +0800 Subject: [PATCH] ring: use WFE to wait for tail update on aarch64 Instead of polling for tail to be updated, use WFE instruction. Signed-off-by: Gavin Hu Signed-off-by: Ruifeng Wang Reviewed-by: Steve Capper Reviewed-by: Ola Liljedahl Reviewed-by: Honnappa Nagarahalli Acked-by: Konstantin Ananyev Acked-by: Jerin Jacob --- lib/ring/rte_ring_c11_pvt.h | 4 ++-- lib/ring/rte_ring_generic_pvt.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h index 759192f4c4..37e0b2afd6 100644 --- a/lib/ring/rte_ring_c11_pvt.h +++ b/lib/ring/rte_ring_c11_pvt.h @@ -2,6 +2,7 @@ * * Copyright (c) 2017,2018 HXT-semitech Corporation. * Copyright (c) 2007-2009 Kip Macy kmacy@freebsd.org + * Copyright (c) 2021 Arm Limited * All rights reserved. * Derived from FreeBSD's bufring.h * Used as BSD-3 Licensed with permission from Kip Macy. @@ -21,8 +22,7 @@ __rte_ring_update_tail(struct rte_ring_headtail *ht, uint32_t old_val, * we need to wait for them to complete */ if (!single) - while (unlikely(ht->tail != old_val)) - rte_pause(); + rte_wait_until_equal_32(&ht->tail, old_val, __ATOMIC_RELAXED); __atomic_store_n(&ht->tail, new_val, __ATOMIC_RELEASE); } diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h index 532deb5e7a..c95ad7e12c 100644 --- a/lib/ring/rte_ring_generic_pvt.h +++ b/lib/ring/rte_ring_generic_pvt.h @@ -23,8 +23,7 @@ __rte_ring_update_tail(struct rte_ring_headtail *ht, uint32_t old_val, * we need to wait for them to complete */ if (!single) - while (unlikely(ht->tail != old_val)) - rte_pause(); + rte_wait_until_equal_32(&ht->tail, old_val, __ATOMIC_RELAXED); ht->tail = new_val; } -- 2.20.1