> -----Original Message-----
> From: Stephen Hemminger <step...@networkplumber.org>
> Sent: Thursday, August 17, 2023 9:53 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <step...@networkplumber.org>; Chengwen Feng
> <fengcheng...@huawei.com>; Kevin Laatz <kevin.la...@intel.com>; Bruce
> Richardson <bruce.richard...@intel.com>; Konstantin Ananyev
> <konstantin.v.anan...@yandex.ru>; Ciara Loftus <ciara.lof...@intel.com>;
> Qi Zhang <qi.z.zh...@intel.com>; Radu Nicolau <radu.nico...@intel.com>;
> Akhil Goyal <gak...@marvell.com>; Mattias Rönnblom
> <mattias.ronnb...@ericsson.com>; Cristian Dumitrescu
> <cristian.dumitre...@intel.com>; tho...@monjalon.net; Ferruh Yigit
> <ferruh.yi...@amd.com>; Andrew Rybchenko
> <andrew.rybche...@oktetlabs.ru>; Yipeng Wang
> <yipeng1.w...@intel.com>; Sameh Gobriel <sameh.gobr...@intel.com>;
> Vladimir Medvedkin <vladimir.medved...@intel.com>; Honnappa
> Nagarahalli <honnappa.nagaraha...@arm.com>
> Subject: [PATCH 02/14] all: remove use of word abort
>
> The term abort is on the Tier 1 "replace immediately" list.
>
> Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
> ---
> .../comp_perf_test_cyclecount.c | 2 +-
> .../comp_perf_test_throughput.c | 2 +-
> app/test-compress-perf/comp_perf_test_verify.c | 2 +-
> app/test/test_dmadev.c | 2 +-
> doc/guides/prog_guide/bpf_lib.rst | 2 +-
> doc/guides/prog_guide/traffic_management.rst | 2 +-
> drivers/dma/hisilicon/hisi_dmadev.c | 4 ++--
> drivers/dma/hisilicon/hisi_dmadev.h | 2 +-
> drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
> examples/ipsec-secgw/rt.c | 4 ++--
> lib/dmadev/rte_dmadev.h | 6 +++---
> lib/eal/include/generic/rte_power_intrinsics.h | 10 +++++-----
> lib/eal/include/generic/rte_rwlock.h | 4 ++--
> lib/eal/include/generic/rte_spinlock.h | 8 ++++----
> lib/eal/include/rte_seqlock.h | 2 +-
> lib/eal/x86/include/rte_rtm.h | 16 ++++++++--------
> lib/eal/x86/include/rte_spinlock.h | 12 ++++++------
> lib/eal/x86/rte_power_intrinsics.c | 8 ++++----
> lib/ethdev/rte_tm.h | 2 +-
> lib/hash/rte_cuckoo_hash.h | 2 +-
> lib/ring/rte_ring_peek_elem_pvt.h | 4 ++--
> 21 files changed, 49 insertions(+), 49 deletions(-)
>
> diff --git a/app/test-compress-perf/comp_perf_test_cyclecount.c b/app/test-
> compress-perf/comp_perf_test_cyclecount.c
> index 4d336ec8d699..810db5704cc6 100644
> --- a/app/test-compress-perf/comp_perf_test_cyclecount.c
> +++ b/app/test-compress-perf/comp_perf_test_cyclecount.c
> @@ -461,7 +461,7 @@ main_loop(struct cperf_cyclecount_ctx *ctx, enum
> rte_comp_xform_type type)
>
> if (test_data->perf_comp_force_stop) {
> RTE_LOG(ERR, USER1,
> - "lcore: %d Perf. test has been aborted by user\n",
> + "lcore: %d Perf. test has been canceled by user\n",
> mem->lcore_id);
> res = -1;
> }
> diff --git a/app/test-compress-perf/comp_perf_test_throughput.c b/app/test-
> compress-perf/comp_perf_test_throughput.c
> index 1f7072d22383..6f27fdf826e2 100644
> --- a/app/test-compress-perf/comp_perf_test_throughput.c
> +++ b/app/test-compress-perf/comp_perf_test_throughput.c
> @@ -323,7 +323,7 @@ main_loop(struct cperf_benchmark_ctx *ctx, enum
> rte_comp_xform_type type)
>
> if (test_data->perf_comp_force_stop) {
> RTE_LOG(ERR, USER1,
> - "lcore: %d Perf. test has been aborted by user\n",
> + "lcore: %d Perf. test has been canceled by user\n",
> mem->lcore_id);
> res = -1;
> }
> diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-
> compress-perf/comp_perf_test_verify.c
> index 7bd18073cff4..541c8d88c5ae 100644
> --- a/app/test-compress-perf/comp_perf_test_verify.c
> +++ b/app/test-compress-perf/comp_perf_test_verify.c
> @@ -382,7 +382,7 @@ main_loop(struct cperf_verify_ctx *ctx, enum
> rte_comp_xform_type type)
>
> if (test_data->perf_comp_force_stop) {
> RTE_LOG(ERR, USER1,
> - "lcore: %d Perf. test has been aborted by user\n",
> + "lcore: %d Perf. test has been canceled by user\n",
> mem->lcore_id);
> res = -1;
> }
> diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c index
> 0736ff2a1867..e6ff3e5b4ec7 100644
> --- a/app/test/test_dmadev.c
> +++ b/app/test/test_dmadev.c
> @@ -57,7 +57,7 @@ runtest(const char *printable, int (*test_fn)(int16_t
> dev_id, uint16_t vchan), i
> if (stats.completed != stats.submitted)
> ERR_RETURN("\nError, not all submitted jobs are
> reported as completed\n");
> if (check_err_stats && stats.errors != 0)
> - ERR_RETURN("\nErrors reported during op
> processing, aborting tests\n");
> + ERR_RETURN("\nErrors reported during op
> processing, stopping
> +tests\n");
> }
> printf("\n");
> return 0;
> diff --git a/doc/guides/prog_guide/bpf_lib.rst
> b/doc/guides/prog_guide/bpf_lib.rst
> index 1cf2d59429e5..17bb82313c29 100644
> --- a/doc/guides/prog_guide/bpf_lib.rst
> +++ b/doc/guides/prog_guide/bpf_lib.rst
> @@ -40,7 +40,7 @@ packet. Registers ``R1-R5`` are scratch registers and must
> not be used to store the data across these instructions.
> These instructions have implicit program exit condition as well. When eBPF
> program is trying to access the data beyond the packet boundary, -the
> interpreter will abort the execution of the program. JIT compilers
> +the interpreter will cancel the execution of the program. JIT compilers
> therefore must preserve this property. ``src_reg`` and ``imm32`` fields are
> explicit inputs to these instructions.
> For example, ``(BPF_IND | BPF_W | BPF_LD)`` means:
> diff --git a/doc/guides/prog_guide/traffic_management.rst
> b/doc/guides/prog_guide/traffic_management.rst
> index c356791a4543..c3673d3c74f2 100644
> --- a/doc/guides/prog_guide/traffic_management.rst
> +++ b/doc/guides/prog_guide/traffic_management.rst
> @@ -214,7 +214,7 @@ typically performs the following steps:
> with immediate effect once the port is started.
>
> This function fails when the currently configured hierarchy is not supported
> by -the Ethernet port, in which case the user can abort or try out another
> +the Ethernet port, in which case the user can retry with another
> hierarchy configuration (e.g. a hierarchy with less leaf nodes), which can be
> built from scratch or by modifying the existing hierarchy configuration. Note
> that this function can still fail due to other causes (e.g. not enough memory
> diff --git a/drivers/dma/hisilicon/hisi_dmadev.c
> b/drivers/dma/hisilicon/hisi_dmadev.c
> index 0e11ca14ccc3..f94e48f0f135 100644
> --- a/drivers/dma/hisilicon/hisi_dmadev.c
> +++ b/drivers/dma/hisilicon/hisi_dmadev.c
> @@ -753,8 +753,8 @@ hisi_dma_convert_status(uint16_t status)
> return RTE_DMA_STATUS_INVALID_OPCODE;
> case HISI_DMA_STATUS_INVALID_LENGTH:
> return RTE_DMA_STATUS_INVALID_LENGTH;
> - case HISI_DMA_STATUS_USER_ABORT:
> - return RTE_DMA_STATUS_USER_ABORT;
> + case HISI_DMA_STATUS_USER_CANCEL:
> + return RTE_DMA_STATUS_USER_CANCEL;
> case HISI_DMA_STATUS_REMOTE_READ_ERROR:
> case HISI_DMA_STATUS_AXI_READ_ERROR:
> return RTE_DMA_STATUS_BUS_READ_ERROR; diff --git
> a/drivers/dma/hisilicon/hisi_dmadev.h
> b/drivers/dma/hisilicon/hisi_dmadev.h
> index 5a17f9f69e25..ffb7ed3b1daf 100644
> --- a/drivers/dma/hisilicon/hisi_dmadev.h
> +++ b/drivers/dma/hisilicon/hisi_dmadev.h
> @@ -152,7 +152,7 @@ enum {
> #define HISI_DMA_STATUS_SUCCESS 0x0
> #define HISI_DMA_STATUS_INVALID_OPCODE 0x1
> #define HISI_DMA_STATUS_INVALID_LENGTH 0x2
> -#define HISI_DMA_STATUS_USER_ABORT 0x4
> +#define HISI_DMA_STATUS_USER_CANCEL 0x4
> #define HISI_DMA_STATUS_REMOTE_READ_ERROR 0x10
> #define HISI_DMA_STATUS_AXI_READ_ERROR 0x20
> #define HISI_DMA_STATUS_AXI_WRITE_ERROR 0x40
> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> b/drivers/net/af_xdp/rte_eth_af_xdp.c
> index c7786cc53a5e..49ca937f3ef7 100644
> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> @@ -776,7 +776,7 @@ eth_monitor_callback(const uint64_t value,
> const uint64_t v = opaque[CLB_VAL_IDX];
> const uint64_t m = (uint32_t)~0;
>
> - /* if the value has changed, abort entering power optimized state */
> + /* if the value has changed, cancel entering power optimized state */
> return (value & m) == v ? 0 : -1;
> }
>
> diff --git a/examples/ipsec-secgw/rt.c b/examples/ipsec-secgw/rt.c index
> ce854ccb6018..eae3b086723f 100644
> --- a/examples/ipsec-secgw/rt.c
> +++ b/examples/ipsec-secgw/rt.c
> @@ -50,7 +50,7 @@ parse_rt_tokens(char **tokens, uint32_t n_tokens,
> route_ipv4 = &rt_ip4[*n_rts];
>
> APP_CHECK(*n_rts <= RT_IPV4_MAX_RULES - 1, status,
> - "too many rt rules, abort insertion\n");
> + "too many rt rules, cancel insertion\n");
> if (status->status < 0)
> return;
>
> @@ -59,7 +59,7 @@ parse_rt_tokens(char **tokens, uint32_t n_tokens,
> route_ipv6 = &rt_ip6[*n_rts];
>
> APP_CHECK(*n_rts <= RT_IPV6_MAX_RULES - 1, status,
> - "too many rt rules, abort insertion\n");
> + "too many rt rules, cancel insertion\n");
> if (status->status < 0)
> return;
> } else {
> diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h index
> b157ab7600f2..f45aff1adc8b 100644
> --- a/lib/dmadev/rte_dmadev.h
> +++ b/lib/dmadev/rte_dmadev.h
> @@ -728,13 +728,13 @@ int rte_dma_dump(int16_t dev_id, FILE *f); enum
> rte_dma_status_code {
> /** The operation completed successfully. */
> RTE_DMA_STATUS_SUCCESSFUL,
> - /** The operation failed to complete due abort by user.
> + /** The operation failed to complete due being cancel by user.
> * This is mainly used when processing dev_stop, user could modify
> the
> - * descriptors (e.g. change one bit to tell hardware abort this job),
> + * descriptors (e.g. change one bit to tell hardware to cancel this
> +job),
> * it allows outstanding requests to be complete as much as possible,
> * so reduce the time to stop the device.
> */
> - RTE_DMA_STATUS_USER_ABORT,
> + RTE_DMA_STATUS_USER_CANCEL,
> /** The operation failed to complete due to following scenarios:
> * The jobs in a particular batch are not attempted because they
> * appeared after a fence where a previous job failed. In some HW diff
> --git a/lib/eal/include/generic/rte_power_intrinsics.h
> b/lib/eal/include/generic/rte_power_intrinsics.h
> index f981df7d75a1..8de92b4cda64 100644
> --- a/lib/eal/include/generic/rte_power_intrinsics.h
> +++ b/lib/eal/include/generic/rte_power_intrinsics.h
> @@ -24,7 +24,7 @@
> /**
> * Callback definition for monitoring conditions. Callbacks with this
> signature
> * will be used by `rte_power_monitor()` to check if the entering of power
> - * optimized state should be aborted.
> + * optimized state should not continue.
> *
> * @param val
> * The value read from memory.
> @@ -33,7 +33,7 @@
> *
> * @return
> * 0 if entering of power optimized state should proceed
> - * -1 if entering of power optimized state should be aborted
> + * -1 if entering of power optimized state should not continue
> */
> typedef int (*rte_power_monitor_clb_t)(const uint64_t val,
> const uint64_t
> opaque[RTE_POWER_MONITOR_OPAQUE_SZ]);
> @@ -47,7 +47,7 @@ struct rte_power_monitor_cond {
> */
> rte_power_monitor_clb_t fn; /**< Callback to be used to check if
> * entering power optimized state should
> - * be aborted.
> + * not happen.
> */
> uint64_t opaque[RTE_POWER_MONITOR_OPAQUE_SZ];
> /**< Callback-specific data */
> @@ -66,7 +66,7 @@ struct rte_power_monitor_cond {
> * size (`pmc->size`) are provided in the `pmc` power monitoring condition.
> If
> * the mask is non-zero, the current value pointed to by the `pmc->addr`
> pointer
> * will be read and compared against the expected value, and if they match,
> the
> - * entering of optimized power state will be aborted. This is intended to
> + * entering of optimized power state will be canceled. This is intended
> + to
> * prevent the CPU from entering optimized power state and waiting on a
> write
> * that has already happened by the time this API is called.
> *
> @@ -141,7 +141,7 @@ int rte_power_pause(const uint64_t tsc_timestamp);
> * Additionally, `expected` 64-bit values and 64-bit masks are provided. If
> * mask is non-zero, the current value pointed to by the `p` pointer will be
> * checked against the expected value, and if they do not match, the entering
> of
> - * optimized power state may be aborted.
> + * optimized power state may be canceled.
> *
> * @warning It is responsibility of the user to check if this function is
> * supported at runtime using `rte_cpu_get_intrinsics_support()` API call.
> diff --git a/lib/eal/include/generic/rte_rwlock.h
> b/lib/eal/include/generic/rte_rwlock.h
> index 9e083bbc61b1..c2c694ae1c77 100644
> --- a/lib/eal/include/generic/rte_rwlock.h
> +++ b/lib/eal/include/generic/rte_rwlock.h
> @@ -258,7 +258,7 @@ rte_rwlock_write_is_locked(rte_rwlock_t *rwl)
> * fails or not available take a read lock
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> @@ -285,7 +285,7 @@ rte_rwlock_read_unlock_tm(rte_rwlock_t *rwl)
> * fails or not available take a write lock
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> diff --git a/lib/eal/include/generic/rte_spinlock.h
> b/lib/eal/include/generic/rte_spinlock.h
> index c50ebaaa80fd..109c5a5adac2 100644
> --- a/lib/eal/include/generic/rte_spinlock.h
> +++ b/lib/eal/include/generic/rte_spinlock.h
> @@ -144,7 +144,7 @@ static inline int rte_tm_supported(void);
> * if it fails or not available take the spinlock.
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> @@ -172,7 +172,7 @@ rte_spinlock_unlock_tm(rte_spinlock_t *sl)
> * if it fails or not available try to take the lock.
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> @@ -277,7 +277,7 @@ static inline int
> rte_spinlock_recursive_trylock(rte_spinlock_recursive_t *slr)
> * if it fails or not available take the recursive spinlocks
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> @@ -303,7 +303,7 @@ static inline void rte_spinlock_recursive_unlock_tm(
> * if it fails or not available try to take the recursive lock
> *
> * NOTE: An attempt to perform a HW I/O operation inside a hardware
> memory
> - * transaction always aborts the transaction since the CPU is not able to
> + * transaction always cancels the transaction since the CPU is not able
> + to
> * roll-back should the transaction fail. Therefore, hardware transactional
> * locks are not advised to be used around rte_eth_rx_burst() and
> * rte_eth_tx_burst() calls.
> diff --git a/lib/eal/include/rte_seqlock.h b/lib/eal/include/rte_seqlock.h
> index fcbb9c586668..d2598fb42cb6 100644
> --- a/lib/eal/include/rte_seqlock.h
> +++ b/lib/eal/include/rte_seqlock.h
> @@ -60,7 +60,7 @@ extern "C" {
> * // Loads may be atomic or non-atomic, as in this example.
> * *param_x = config->param_x;
> * strcpy(param_y, config->param_y);
> - * // An alternative to an immediate retry is to abort and
> + * // An alternative to an immediate retry is to quit and
> * // try again at some later time, assuming progress is
> * // possible without the data.
> * } while (rte_seqlock_read_retry(&config->lock, sn));
> diff --git a/lib/eal/x86/include/rte_rtm.h b/lib/eal/x86/include/rte_rtm.h
> index 36bf49846f08..4db9018543a9 100644
> --- a/lib/eal/x86/include/rte_rtm.h
> +++ b/lib/eal/x86/include/rte_rtm.h
> @@ -17,13 +17,13 @@ extern "C" {
>
>
> #define RTE_XBEGIN_STARTED (~0u)
> -#define RTE_XABORT_EXPLICIT (1 << 0)
> -#define RTE_XABORT_RETRY (1 << 1)
> -#define RTE_XABORT_CONFLICT (1 << 2)
> -#define RTE_XABORT_CAPACITY (1 << 3)
> -#define RTE_XABORT_DEBUG (1 << 4)
> -#define RTE_XABORT_NESTED (1 << 5)
> -#define RTE_XABORT_CODE(x) (((x) >> 24) & 0xff)
> +#define RTE_XCANCEL_EXPLICIT (1 << 0)
> +#define RTE_XCANCEL_RETRY (1 << 1)
> +#define RTE_XCANCEL_CONFLICT (1 << 2)
> +#define RTE_XCANCEL_CAPACITY (1 << 3)
> +#define RTE_XCANCEL_DEBUG (1 << 4)
> +#define RTE_XCANCEL_NESTED (1 << 5)
> +#define RTE_XCANCEL_CODE(x) (((x) >> 24) & 0xff)
>
> static __rte_always_inline
> unsigned int rte_xbegin(void)
> @@ -41,7 +41,7 @@ void rte_xend(void)
> }
>
> /* not an inline function to workaround a clang bug with -O0 */ -#define
> rte_xabort(status) do { \
> +#define rte_xcancel(status) do { \
> asm volatile(".byte 0xc6,0xf8,%P0" :: "i" (status) : "memory"); \ }
> while (0)
>
> diff --git a/lib/eal/x86/include/rte_spinlock.h
> b/lib/eal/x86/include/rte_spinlock.h
> index 0b20ddfd73da..4e3a33f61ae8 100644
> --- a/lib/eal/x86/include/rte_spinlock.h
> +++ b/lib/eal/x86/include/rte_spinlock.h
> @@ -18,7 +18,7 @@ extern "C" {
> #include "rte_cycles.h"
>
> #define RTE_RTM_MAX_RETRIES (20)
> -#define RTE_XABORT_LOCK_BUSY (0xff)
> +#define RTE_XCANCEL_LOCK_BUSY (0xff)
>
> #ifndef RTE_FORCE_INTRINSICS
> static inline void
> @@ -93,16 +93,16 @@ rte_try_tm(volatile int *lock)
>
> if (likely(RTE_XBEGIN_STARTED == status)) {
> if (unlikely(*lock))
> - rte_xabort(RTE_XABORT_LOCK_BUSY);
> + rte_xcancel(RTE_XCANCEL_LOCK_BUSY);
> else
> return 1;
> }
> while (*lock)
> rte_pause();
>
> - if ((status & RTE_XABORT_CONFLICT) ||
> - ((status & RTE_XABORT_EXPLICIT) &&
> - (RTE_XABORT_CODE(status) == RTE_XABORT_LOCK_BUSY)))
> {
> + if ((status & RTE_XCANCEL_CONFLICT) ||
> + ((status & RTE_XCANCEL_EXPLICIT) &&
> + (RTE_XCANCEL_CODE(status) ==
> RTE_XCANCEL_LOCK_BUSY))) {
> /* add a small delay before retrying, basing the
> * delay on the number of times we've already tried,
> * to give a back-off type of behaviour. We @@ -116,7
> +116,7 @@ rte_try_tm(volatile int *lock)
> continue;
> }
>
> - if ((status & RTE_XABORT_RETRY) == 0) /* do not retry */
> + if ((status & RTE_XCANCEL_RETRY) == 0) /* do not retry */
> break;
> }
> return 0;
> diff --git a/lib/eal/x86/rte_power_intrinsics.c
> b/lib/eal/x86/rte_power_intrinsics.c
> index f749da9b851a..01101d4e3190 100644
> --- a/lib/eal/x86/rte_power_intrinsics.c
> +++ b/lib/eal/x86/rte_power_intrinsics.c
> @@ -118,7 +118,7 @@ rte_power_monitor(const struct
> rte_power_monitor_cond *pmc,
>
> cur_value = __get_umwait_val(pmc->addr, pmc->size);
>
> - /* check if callback indicates we should abort */
> + /* check if callback indicates we should not proceed */
> if (pmc->fn(cur_value, pmc->opaque) != 0)
> goto end;
>
> @@ -242,7 +242,7 @@ rte_power_monitor_multi(const struct
> rte_power_monitor_cond pmc[],
> /* start new transaction region */
> rc = rte_xbegin();
>
> - /* transaction abort, possible write to one of wait addresses */
> + /* transaction canceled, possible write to one of wait addresses */
> if (rc != RTE_XBEGIN_STARTED)
> return 0;
>
> @@ -251,7 +251,7 @@ rte_power_monitor_multi(const struct
> rte_power_monitor_cond pmc[],
> * the read set. This means that when we trigger a wakeup from
> another
> * thread, even if we don't have a defined wakeup address and thus
> don't
> * actually cause any writes, the act of locking our lock will itself
> - * trigger the wakeup and abort the transaction.
> + * trigger the wakeup and cancel the transaction.
> */
> rte_spinlock_is_locked(&s->lock);
>
> @@ -271,7 +271,7 @@ rte_power_monitor_multi(const struct
> rte_power_monitor_cond pmc[],
>
> const uint64_t val = __get_umwait_val(c->addr, c->size);
>
> - /* abort if callback indicates that we need to stop */
> + /* cancel if callback indicates that we need to stop */
> if (c->fn(val, c->opaque) != 0)
> break;
> }
> diff --git a/lib/ethdev/rte_tm.h b/lib/ethdev/rte_tm.h index
> 08c5fafecdf3..8b5d477840e0 100644
> --- a/lib/ethdev/rte_tm.h
> +++ b/lib/ethdev/rte_tm.h
> @@ -1710,7 +1710,7 @@ rte_tm_node_resume(uint16_t port_id,
> * the current port, with immediate effect once the port is started.
> *
> * This function fails when the currently configured hierarchy is not
> supported
> - * by the Ethernet port, in which case the user can abort or try out another
> + * by the Ethernet port, in which case the user can retry out another
May be " by the Ethernet port, in which case the user can stop or try out
another"?
> * hierarchy configuration (e.g. a hierarchy with less leaf nodes), which
> can be
> * build from scratch (when *clear_on_fail* is enabled) or by modifying the
> * existing hierarchy configuration (when *clear_on_fail* is disabled).
> diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h index
> eb2644f74b1b..2bd01d133a9c 100644
> --- a/lib/hash/rte_cuckoo_hash.h
> +++ b/lib/hash/rte_cuckoo_hash.h
> @@ -124,7 +124,7 @@ const rte_hash_cmp_eq_t
> cmp_jump_table[NUM_KEY_CMP_CASES] = {
>
> #define RTE_HASH_BFS_QUEUE_MAX_LEN 1000
>
> -#define RTE_XABORT_CUCKOO_PATH_INVALIDED 0x4
> +#define RTE_CANCEL_CUCKOO_PATH_INVALIDED 0x4
>
> #define RTE_HASH_TSX_MAX_RETRY 10
>
> diff --git a/lib/ring/rte_ring_peek_elem_pvt.h
> b/lib/ring/rte_ring_peek_elem_pvt.h
> index bb0a7d567037..400bfffc3be2 100644
> --- a/lib/ring/rte_ring_peek_elem_pvt.h
> +++ b/lib/ring/rte_ring_peek_elem_pvt.h
> @@ -23,7 +23,7 @@
> * This function should be used only for single thread producer/consumer.
> * Check that user didn't request to move tail above the head.
> * In that situation:
> - * - return zero, that will cause abort any pending changes and
> + * - return zero, that will cause cancel any pending changes and
This could be " return zero, that will result in canceling any pending changes
and"
> * return head to its previous position.
> * - throw an assert in debug mode.
> */
> @@ -67,7 +67,7 @@ __rte_ring_st_set_head_tail(struct rte_ring_headtail
> *ht, uint32_t tail,
> * This function should be used only for producer/consumer in MT_HTS
> mode.
> * Check that user didn't request to move tail above the head.
> * In that situation:
> - * - return zero, that will cause abort any pending changes and
> + * - return zero, that will cause cancel any pending changes and
This could be " return zero, that will result in canceling any pending changes
and"
> * return head to its previous position.
> * - throw an assert in debug mode.
> */
> --
> 2.39.2
