* [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 9:08 ` Bruce Richardson
2023-08-18 2:52 ` [PATCH 02/14] all: remove use of word abort Stephen Hemminger
` (13 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
The term abort is on the "Replace now" list of words.
Use cancel instead.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
examples/l2fwd-jobstats/main.c | 2 +-
lib/jobstats/rte_jobstats.c | 2 +-
lib/jobstats/rte_jobstats.h | 9 ++++++++-
lib/jobstats/version.map | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index 2653db473538..a3b604e307e1 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -534,7 +534,7 @@ l2fwd_main_loop(void)
if (likely(repeats != 1))
rte_jobstats_finish(&qconf->idle_job, qconf->idle_job.target);
else
- rte_jobstats_abort(&qconf->idle_job);
+ rte_jobstats_cancel(&qconf->idle_job);
rte_timer_manage();
rte_jobstats_context_finish(&qconf->jobs_context);
diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
index af565a14eaf3..d8c17f135471 100644
--- a/lib/jobstats/rte_jobstats.c
+++ b/lib/jobstats/rte_jobstats.c
@@ -139,7 +139,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job)
}
int
-rte_jobstats_abort(struct rte_jobstats *job)
+rte_jobstats_cancel(struct rte_jobstats *job)
{
struct rte_jobstats_context *ctx;
uint64_t now, exec_time;
diff --git a/lib/jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h
index 45b460e6030a..89294d181592 100644
--- a/lib/jobstats/rte_jobstats.h
+++ b/lib/jobstats/rte_jobstats.h
@@ -218,7 +218,14 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job);
* -EINVAL if job is NULL or job was not started (it have no context).
*/
int
-rte_jobstats_abort(struct rte_jobstats *job);
+rte_jobstats_cancel(struct rte_jobstats *job);
+
+__rte_deprecated
+static inline int
+rte_jobstats_abort(struct rte_jobstats *job)
+{
+ return rte_jobstats_cancel(job);
+}
/**
* Mark that *job* finished its execution. Context in which it was executing
diff --git a/lib/jobstats/version.map b/lib/jobstats/version.map
index 3b8f9d6ac464..c334033a6048 100644
--- a/lib/jobstats/version.map
+++ b/lib/jobstats/version.map
@@ -1,7 +1,7 @@
DPDK_24 {
global:
- rte_jobstats_abort;
+ rte_jobstats_cancel;
rte_jobstats_context_finish;
rte_jobstats_context_init;
rte_jobstats_context_reset;
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel
2023-08-18 2:52 ` [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
@ 2023-08-18 9:08 ` Bruce Richardson
2023-08-18 16:10 ` Stephen Hemminger
0 siblings, 1 reply; 37+ messages in thread
From: Bruce Richardson @ 2023-08-18 9:08 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
On Thu, Aug 17, 2023 at 07:52:36PM -0700, Stephen Hemminger wrote:
> The term abort is on the "Replace now" list of words.
> Use cancel instead.
>
I see cancel generally being used as a replacement throughout this
patchset, but I wonder if the use of th term could be confusing as it
doesn't strictly match the term "abort" at least to my mind.
When an operation is aborted, (to me anyway) it generally means that the
operation is just stopped at whatever point it is at, and nothing more is
done. However, when an operation is cancelled, that would imply to me that
the operation is not only stopped, but whatever tasks were already done by
that operation are undone. Would others share this understanding? If so, we
should make the rollback/no-rollback behaviour clear.
/Bruce
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel
2023-08-18 9:08 ` Bruce Richardson
@ 2023-08-18 16:10 ` Stephen Hemminger
0 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 16:10 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev
On Fri, 18 Aug 2023 10:08:58 +0100
Bruce Richardson <bruce.richardson@intel.com> wrote:
> On Thu, Aug 17, 2023 at 07:52:36PM -0700, Stephen Hemminger wrote:
> > The term abort is on the "Replace now" list of words.
> > Use cancel instead.
> >
> I see cancel generally being used as a replacement throughout this
> patchset, but I wonder if the use of th term could be confusing as it
> doesn't strictly match the term "abort" at least to my mind.
>
> When an operation is aborted, (to me anyway) it generally means that the
> operation is just stopped at whatever point it is at, and nothing more is
> done. However, when an operation is cancelled, that would imply to me that
> the operation is not only stopped, but whatever tasks were already done by
> that operation are undone. Would others share this understanding? If so, we
> should make the rollback/no-rollback behaviour clear.
>
> /Bruce
It seemed like the best of the alternatives proposed here:
https://inclusivenaming.org/word-lists/tier-1/abort/
Recommended Replacements
User-Initiated Termination
Force quit
Cancel
System-Initiated Termination
Fail
Close (app, program, connection)
End
Halt
Hard stop
Stop (something you triggered)
I don't think the rollback semantics are implied by either word.
They should be spelled out more though.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 02/14] all: remove use of word abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 4:04 ` Honnappa Nagarahalli
2023-08-18 2:52 ` [PATCH 03/14] pipeline: remove use of term abort Stephen Hemminger
` (12 subsequent siblings)
14 siblings, 1 reply; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Chengwen Feng, Kevin Laatz, Bruce Richardson,
Konstantin Ananyev, Ciara Loftus, Qi Zhang, Radu Nicolau,
Akhil Goyal, Mattias Rönnblom, Cristian Dumitrescu,
Thomas Monjalon, Ferruh Yigit, Andrew Rybchenko, Yipeng Wang,
Sameh Gobriel, Vladimir Medvedkin, Honnappa Nagarahalli
The term abort is on the Tier 1 "replace immediately" list.
Signed-off-by: Stephen Hemminger <stephen@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
* 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
* 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
* return head to its previous position.
* - throw an assert in debug mode.
*/
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* RE: [PATCH 02/14] all: remove use of word abort
2023-08-18 2:52 ` [PATCH 02/14] all: remove use of word abort Stephen Hemminger
@ 2023-08-18 4:04 ` Honnappa Nagarahalli
0 siblings, 0 replies; 37+ messages in thread
From: Honnappa Nagarahalli @ 2023-08-18 4:04 UTC (permalink / raw)
To: Stephen Hemminger, dev
Cc: Chengwen Feng, Kevin Laatz, Bruce Richardson, Konstantin Ananyev,
Ciara Loftus, Qi Zhang, Radu Nicolau, Akhil Goyal,
Mattias Rönnblom, Cristian Dumitrescu, thomas, Ferruh Yigit,
Andrew Rybchenko, Yipeng Wang, Sameh Gobriel, Vladimir Medvedkin,
nd, nd
> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Thursday, August 17, 2023 9:53 PM
> To: dev@dpdk.org
> Cc: Stephen Hemminger <stephen@networkplumber.org>; Chengwen Feng
> <fengchengwen@huawei.com>; Kevin Laatz <kevin.laatz@intel.com>; Bruce
> Richardson <bruce.richardson@intel.com>; Konstantin Ananyev
> <konstantin.v.ananyev@yandex.ru>; Ciara Loftus <ciara.loftus@intel.com>;
> Qi Zhang <qi.z.zhang@intel.com>; Radu Nicolau <radu.nicolau@intel.com>;
> Akhil Goyal <gakhil@marvell.com>; Mattias Rönnblom
> <mattias.ronnblom@ericsson.com>; Cristian Dumitrescu
> <cristian.dumitrescu@intel.com>; thomas@monjalon.net; Ferruh Yigit
> <ferruh.yigit@amd.com>; Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru>; Yipeng Wang
> <yipeng1.wang@intel.com>; Sameh Gobriel <sameh.gobriel@intel.com>;
> Vladimir Medvedkin <vladimir.medvedkin@intel.com>; Honnappa
> Nagarahalli <Honnappa.Nagarahalli@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 <stephen@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
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 03/14] pipeline: remove use of term abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
2023-08-18 2:52 ` [PATCH 02/14] all: remove use of word abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
` (11 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Cristian Dumitrescu
Replace with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++--------------
lib/pipeline/rte_swx_ctl.h | 8 ++++----
lib/pipeline/version.map | 2 +-
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index 857770d297a4..41d07e9b3a19 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -2063,7 +2063,7 @@ table_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
* failed commit operation to remove ALL the pending work for ALL the tables.
*/
static void
-table_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
+table_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
{
struct table *table = &ctl->tables[table_id];
@@ -2366,7 +2366,7 @@ selector_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
}
static void
-selector_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
+selector_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
{
struct selector *s = &ctl->selectors[selector_id];
uint32_t group_id;
@@ -2545,7 +2545,7 @@ learner_rollfwd_finalize(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
}
static void
-learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
+learner_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
{
struct learner *l = &ctl->learners[learner_id];
@@ -2554,7 +2554,8 @@ learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
}
int
-rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)
+rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
+ int cancel_on_fail)
{
struct rte_swx_table_state *ts;
int status = 0;
@@ -2622,25 +2623,25 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)
rollback:
for (i = 0; i < ctl->info.n_tables; i++) {
table_rollback(ctl, i);
- if (abort_on_fail)
- table_abort(ctl, i);
+ if (cancel_on_fail)
+ table_cancel(ctl, i);
}
for (i = 0; i < ctl->info.n_selectors; i++) {
selector_rollback(ctl, i);
- if (abort_on_fail)
- selector_abort(ctl, i);
+ if (cancel_on_fail)
+ selector_cancel(ctl, i);
}
- if (abort_on_fail)
+ if (cancel_on_fail)
for (i = 0; i < ctl->info.n_learners; i++)
- learner_abort(ctl, i);
+ learner_cancel(ctl, i);
return status;
}
void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl)
{
uint32_t i;
@@ -2648,13 +2649,13 @@ rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)
return;
for (i = 0; i < ctl->info.n_tables; i++)
- table_abort(ctl, i);
+ table_cancel(ctl, i);
for (i = 0; i < ctl->info.n_selectors; i++)
- selector_abort(ctl, i);
+ selector_cancel(ctl, i);
for (i = 0; i < ctl->info.n_learners; i++)
- learner_abort(ctl, i);
+ learner_cancel(ctl, i);
}
static int
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 6ef2551ab534..14973b74172b 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -1045,7 +1045,7 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,
*
* @param[in] ctl
* Pipeline control handle.
- * @param[in] abort_on_fail
+ * @param[in] revert_on_fail
* When non-zero (false), all the scheduled work is discarded after a failed
* commit. Otherwise, the scheduled work is still kept pending for the next
* commit.
@@ -1056,10 +1056,10 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,
__rte_experimental
int
rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
- int abort_on_fail);
+ int revert_on_fail);
/**
- * Pipeline abort
+ * Pipeline cancel
*
* Discard all the scheduled table work.
*
@@ -1068,7 +1068,7 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
*/
__rte_experimental
void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl);
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl);
/**
* Pipeline table entry read
diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map
index 6997b69340ef..1ddd598fa079 100644
--- a/lib/pipeline/version.map
+++ b/lib/pipeline/version.map
@@ -62,7 +62,7 @@ EXPERIMENTAL {
# added in 20.11
rte_swx_ctl_action_arg_info_get;
rte_swx_ctl_action_info_get;
- rte_swx_ctl_pipeline_abort;
+ rte_swx_ctl_pipeline_cancel;
rte_swx_ctl_pipeline_commit;
rte_swx_ctl_pipeline_create;
rte_swx_ctl_pipeline_free;
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic()
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (2 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 03/14] pipeline: remove use of term abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 05/14] event/dlb2: remove word abort in comments Stephen Hemminger
` (10 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Jochen Behrens
Do the same thing but be better about wording.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vmxnet3/vmxnet3_rxtx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 380f41f98be2..98bdd6523a4e 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -565,9 +565,8 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
dgram_cksum);
break;
default:
- PMD_TX_LOG(WARNING, "requested cksum offload not supported %#llx",
- txm->ol_flags & RTE_MBUF_F_TX_L4_MASK);
- abort();
+ /* should probably count as tx error and drop instead */
+ rte_panic("unsupported cksum offload: %#llx\n", txm->ol_flags);
}
deferred++;
} else {
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 05/14] event/dlb2: remove word abort in comments
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (3 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 06/14] net/vdev_netvsc: replace use of term abort Stephen Hemminger
` (9 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Timothy McDaniel
Abort is on the Tier 1 non-inclusive word list.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/event/dlb2/dlb2.c | 2 +-
drivers/event/dlb2/pf/base/dlb2_resource.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 60c5cd48040e..d1a7c58721c5 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -3317,7 +3317,7 @@ static int
dlb2_monitor_callback(const uint64_t val,
const uint64_t opaque[RTE_POWER_MONITOR_OPAQUE_SZ])
{
- /* abort if the value matches */
+ /* terminat if the value matches */
return (val & opaque[CLB_MASK_IDX]) == opaque[CLB_VAL_IDX] ? -1 : 0;
}
diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c b/drivers/event/dlb2/pf/base/dlb2_resource.c
index dd8390a01320..05171c86aa06 100644
--- a/drivers/event/dlb2/pf/base/dlb2_resource.c
+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c
@@ -5941,7 +5941,7 @@ int dlb2_hw_unmap_qid(struct dlb2_hw *hw,
st = DLB2_QUEUE_MAP_IN_PROG;
if (dlb2_port_find_slot_queue(port, st, queue, &i)) {
/*
- * Since the in-progress map was aborted, re-enable the QID's
+ * Since the in-progress map was terminated, re-enable the QID's
* inflights.
*/
if (queue->num_pending_additions == 0)
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 06/14] net/vdev_netvsc: replace use of term abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (4 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 05/14] event/dlb2: remove word abort in comments Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 07/14] net/netvsc: replace abort with cancel Stephen Hemminger
` (8 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Matan Azrad
Replace abort with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vdev_netvsc/vdev_netvsc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index c3e045d892b7..1a9c03c0f0b1 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -141,7 +141,7 @@ vdev_netvsc_iface_is_netvsc(const struct if_nameindex *iface)
* the system.
*
* @param func
- * Callback function pointer. List traversal is aborted when this function
+ * Callback function pointer. List traversal is terminated when this function
* returns a nonzero value.
* @param is_netvsc
* Indicates the device type to iterate - netvsc or non-netvsc.
@@ -151,7 +151,7 @@ vdev_netvsc_iface_is_netvsc(const struct if_nameindex *iface)
* @return
* 0 when the entire list is traversed successfully, a negative error code
* in case or failure, or the nonzero value returned by @p func when list
- * traversal is aborted.
+ * traversal is terminated.
*/
static int
vdev_netvsc_foreach_iface(int (*func)(const struct if_nameindex *iface,
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 07/14] net/netvsc: replace abort with cancel
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (5 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 06/14] net/vdev_netvsc: replace use of term abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 08/14] net/ionic: remove word aborting Stephen Hemminger
` (7 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Long Li
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/netvsc/rndis.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/rndis.h b/drivers/net/netvsc/rndis.h
index eac9a99fd8ef..d2e9388ae484 100644
--- a/drivers/net/netvsc/rndis.h
+++ b/drivers/net/netvsc/rndis.h
@@ -49,7 +49,7 @@
#define RNDIS_STATUS_MULTICAST_FULL 0xC0010009
#define RNDIS_STATUS_MULTICAST_EXISTS 0xC001000A
#define RNDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B
-#define RNDIS_STATUS_REQUEST_ABORTED 0xC001000C
+#define RNDIS_STATUS_REQUEST_CANCELED 0xC001000C
#define RNDIS_STATUS_RESET_IN_PROGRESS 0xC001000D
#define RNDIS_STATUS_CLOSING_INDICATING 0xC001000E
#define RNDIS_STATUS_INVALID_PACKET 0xC001000F
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 08/14] net/ionic: remove word aborting
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (6 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 07/14] net/netvsc: replace abort with cancel Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 09/14] net/bnx2x: replace abort with cancel Stephen Hemminger
` (6 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Andrew Boyer
Since abort is on the Tier 1 list of words to replace;
just remove the unnecessary part of the log message.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/ionic/ionic_dev_pci.c | 6 +++---
drivers/net/ionic/ionic_ethdev.c | 18 +++++++++---------
drivers/net/ionic/ionic_lif.c | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ionic/ionic_dev_pci.c b/drivers/net/ionic/ionic_dev_pci.c
index 5e74a6da7149..aec76b6f0024 100644
--- a/drivers/net/ionic/ionic_dev_pci.c
+++ b/drivers/net/ionic/ionic_dev_pci.c
@@ -43,13 +43,13 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR0: dev_cmd and interrupts */
if (num_bars < 1) {
- IONIC_PRINT(ERR, "No bars found, aborting\n");
+ IONIC_PRINT(ERR, "No bars found\n");
return -EFAULT;
}
if (bar->len < IONIC_BAR0_SIZE) {
IONIC_PRINT(ERR,
- "Resource bar size %lu too small, aborting\n",
+ "Resource bar size %lu too small\n",
bar->len);
return -EFAULT;
}
@@ -84,7 +84,7 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR1: doorbells */
bar++;
if (num_bars < 2) {
- IONIC_PRINT(ERR, "Doorbell bar missing, aborting\n");
+ IONIC_PRINT(ERR, "Doorbell bar missing\n");
return -EFAULT;
}
diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 340fd0cd5923..2eee70d226dd 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -1030,14 +1030,14 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)
err = ionic_lif_alloc(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot allocate LIFs: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot allocate LIFs: %d",
err);
goto err;
}
err = ionic_lif_init(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot init LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init LIFs: %d", err);
goto err_free_lif;
}
@@ -1144,48 +1144,48 @@ eth_ionic_dev_probe(void *bus_dev, struct rte_device *rte_dev,
/* Discover ionic dev resources */
err = ionic_setup(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot setup device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot setup device: %d", err);
goto err_free_adapter;
}
err = ionic_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify device: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify device: %d",
err);
goto err_free_adapter;
}
err = ionic_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init device: %d", err);
goto err_free_adapter;
}
/* Configure the ports */
err = ionic_port_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify port: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify port: %d",
err);
goto err_free_adapter;
}
err = ionic_port_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init port: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init port: %d", err);
goto err_free_adapter;
}
/* Configure LIFs */
err = ionic_lif_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify lif: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot identify lif: %d", err);
goto err_free_adapter;
}
/* Allocate and init LIFs */
err = ionic_lifs_size(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot size LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot size LIFs: %d", err);
goto err_free_adapter;
}
diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 25b490deb626..1944205428bc 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -1045,7 +1045,7 @@ ionic_lif_alloc(struct ionic_lif *lif)
lif->kern_dbpage = adapter->idev.db_pages;
if (!lif->kern_dbpage) {
- IONIC_PRINT(ERR, "Cannot map dbpage, aborting");
+ IONIC_PRINT(ERR, "Cannot map dbpage");
return -ENOMEM;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 09/14] net/bnx2x: replace abort with cancel
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (7 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 08/14] net/ionic: remove word aborting Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 10/14] net/mlx5: " Stephen Hemminger
` (5 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Julien Aube
Don't use the term abort.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/bnx2x/bnx2x.c | 18 +++++++++---------
drivers/net/bnx2x/bnx2x_vfpf.c | 4 ++--
drivers/net/bnx2x/ecore_hsi.h | 6 +++---
drivers/net/bnx2x/ecore_reg.h | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 29c16bb207c7..5de0e5a65da1 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2746,13 +2746,13 @@ static int bnx2x_nic_load_request(struct bnx2x_softc *sc, uint32_t * load_code)
(*load_code) = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_REQ,
DRV_MSG_CODE_LOAD_REQ_WITH_LFA);
- /* if the MCP fails to respond we must abort */
+ /* if the MCP fails to respond we must exit */
if (!(*load_code)) {
PMD_DRV_LOG(NOTICE, sc, "MCP response failure!");
return -1;
}
- /* if MCP refused then must abort */
+ /* if MCP refused then must exit */
if ((*load_code) == FW_MSG_CODE_DRV_LOAD_REFUSED) {
PMD_DRV_LOG(NOTICE, sc, "MCP refused load request");
return -1;
@@ -2784,7 +2784,7 @@ static int bnx2x_nic_load_analyze_req(struct bnx2x_softc *sc, uint32_t load_code
PMD_DRV_LOG(DEBUG, sc, "loaded FW 0x%08x / my FW 0x%08x",
loaded_fw, my_fw);
- /* abort nic load if version mismatch */
+ /* stop nic load if version mismatch */
if (my_fw != loaded_fw) {
PMD_DRV_LOG(NOTICE, sc,
"FW 0x%08x already loaded (mine is 0x%08x)",
@@ -6324,7 +6324,7 @@ static int bnx2x_leader_reset(struct bnx2x_softc *sc)
load_code = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_REQ,
DRV_MSG_CODE_LOAD_REQ_WITH_LFA);
if (!load_code) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
goto exit_leader_reset;
}
@@ -6332,14 +6332,14 @@ static int bnx2x_leader_reset(struct bnx2x_softc *sc)
if ((load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP) &&
(load_code != FW_MSG_CODE_DRV_LOAD_COMMON)) {
PMD_DRV_LOG(NOTICE, sc,
- "MCP unexpected response, aborting");
+ "MCP unexpected response");
rc = -1;
goto exit_leader_reset2;
}
load_code = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_DONE, 0);
if (!load_code) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
goto exit_leader_reset2;
}
@@ -7325,7 +7325,7 @@ int bnx2x_nic_load(struct bnx2x_softc *sc)
bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_DONE, 0);
if (!load_code) {
PMD_DRV_LOG(NOTICE, sc,
- "MCP response failure, aborting");
+ "MCP response failure");
sc->state = BNX2X_STATE_ERROR;
rc = -ENXIO;
goto bnx2x_nic_load_error3;
@@ -9091,7 +9091,7 @@ static int bnx2x_prev_mcp_done(struct bnx2x_softc *sc)
uint32_t rc = bnx2x_fw_command(sc, DRV_MSG_CODE_UNLOAD_DONE,
DRV_MSG_CODE_UNLOAD_SKIP_LINK_RESET);
if (!rc) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
return -1;
}
@@ -9507,7 +9507,7 @@ static int bnx2x_prev_unload(struct bnx2x_softc *sc)
/* Lock MCP using an unload request */
fw = bnx2x_fw_command(sc, DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS, 0);
if (!fw) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
break;
}
diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c
index 63953c2979ce..3f99be33168b 100644
--- a/drivers/net/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/bnx2x/bnx2x_vfpf.c
@@ -42,7 +42,7 @@ bnx2x_check_bull(struct bnx2x_softc *sc)
++tries;
}
if (tries == BNX2X_VF_BULLETIN_TRIES) {
- PMD_DRV_LOG(ERR, sc, "pf to vf bulletin board crc was wrong %d consecutive times. Aborting",
+ PMD_DRV_LOG(ERR, sc, "pf to vf bulletin board crc was wrong %d consecutive times. Canceling",
tries);
return FALSE;
}
@@ -123,7 +123,7 @@ bnx2x_do_req4pf(struct bnx2x_softc *sc, rte_iova_t phys_addr)
bnx2x_check_bull(sc);
if (sc->old_bulletin.valid_bitmap & (1 << CHANNEL_DOWN)) {
- PMD_DRV_LOG(ERR, sc, "channel is down. Aborting message sending");
+ PMD_DRV_LOG(ERR, sc, "channel is down. Canceling message sending");
return -EINVAL;
}
diff --git a/drivers/net/bnx2x/ecore_hsi.h b/drivers/net/bnx2x/ecore_hsi.h
index eda79408e95a..e33aeb4ea7c1 100644
--- a/drivers/net/bnx2x/ecore_hsi.h
+++ b/drivers/net/bnx2x/ecore_hsi.h
@@ -2693,11 +2693,11 @@ struct shmem2_region {
/* generic flags controlled by the driver */
uint32_t drv_flags; /* 0x00bc */
#define DRV_FLAGS_DCB_CONFIGURED 0x0
- #define DRV_FLAGS_DCB_CONFIGURATION_ABORTED 0x1
+ #define DRV_FLAGS_DCB_CONFIGURATION_CANCELED 0x1
#define DRV_FLAGS_DCB_MFW_CONFIGURED 0x2
#define DRV_FLAGS_PORT_MASK ((1 << DRV_FLAGS_DCB_CONFIGURED) | \
- (1 << DRV_FLAGS_DCB_CONFIGURATION_ABORTED) | \
+ (1 << DRV_FLAGS_DCB_CONFIGURATION_CANCELED) | \
(1 << DRV_FLAGS_DCB_MFW_CONFIGURED))
/* Port offset*/
#define DRV_FLAGS_P0_OFFSET 0
@@ -6368,7 +6368,7 @@ struct ustorm_per_queue_stats {
__le32 coalesced_pkts;
struct regpair coalesced_bytes;
__le32 coalesced_events;
- __le32 coalesced_aborts;
+ __le32 coalesced_cancels;
};
/*
diff --git a/drivers/net/bnx2x/ecore_reg.h b/drivers/net/bnx2x/ecore_reg.h
index 6f7b0522f25c..a6e82d46d753 100644
--- a/drivers/net/bnx2x/ecore_reg.h
+++ b/drivers/net/bnx2x/ecore_reg.h
@@ -2594,7 +2594,7 @@
/* [R 13] Details of first request received with error. [2:0] - PFID. [3] -
* VF_VALID. [9:4] - VFID. [11:10] - Error Code - 0 - Indicates Completion
* Timeout of a User Tx non-posted request. 1 - unsupported request. 2 -
- * completer abort. 3 - Illegal value for this field. [12] valid - indicates
+ * completer cancel. 3 - Illegal value for this field. [12] valid - indicates
* if there was a completion error since the last time this register was
* cleared.
*/
@@ -2602,7 +2602,7 @@
/* [R 18] Details of first ATS Translation Completion request received with
* error. [2:0] - PFID. [3] - VF_VALID. [9:4] - VFID. [11:10] - Error Code -
* 0 - Indicates Completion Timeout of a User Tx non-posted request. 1 -
- * unsupported request. 2 - completer abort. 3 - Illegal value for this
+ * unsupported request. 2 - completer cancel. 3 - Illegal value for this
* field. [16:12] - ATC OTB EntryID. [17] valid - indicates if there was a
* completion error since the last time this register was cleared.
*/
@@ -4786,7 +4786,7 @@
#define PXPCS_TL_CONTROL_5_DL_ERR_ATTN (1 << 22) /*RO*/
#define PXPCS_TL_CONTROL_5_TTX_ERR_NP_TAG_IN_USE (1 << 21) /*WC*/
#define PXPCS_TL_CONTROL_5_TRX_ERR_UNEXP_RTAG (1 << 20) /*WC*/
-#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_ABORT1 (1 << 19) /*WC*/
+#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_CANCEL1 (1 << 19) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_UNSPPORT1 (1 << 18) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_ECRC1 (1 << 17) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_MALF_TLP1 (1 << 16) /*WC*/
@@ -4796,7 +4796,7 @@
#define PXPCS_TL_CONTROL_5_ERR_CPL_TIMEOUT1 (1 << 12) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_FC_PRTL1 (1 << 11) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_PSND_TLP1 (1 << 10) /*WC*/
-#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_ABORT (1 << 9) /*WC*/
+#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_CANCEL (1 << 9) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_UNSPPORT (1 << 8) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_ECRC (1 << 7) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_MALF_TLP (1 << 6) /*WC*/
@@ -4809,7 +4809,7 @@
#define PXPCS_TL_FUNC345_STAT 0x854
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT4 (1 << 29) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL4 (1 << 29) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT4 \
(1 << 28) /* Unsupported Request Error Status in function4, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4840,7 +4840,7 @@
#define PXPCS_TL_FUNC345_STAT_ERR_PSND_TLP4 \
(1 << 20) /* Poisoned Error Status Status in function 4, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT3 (1 << 19) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL3 (1 << 19) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT3 \
(1 << 18) /* Unsupported Request Error Status in function3, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4871,7 +4871,7 @@
#define PXPCS_TL_FUNC345_STAT_ERR_PSND_TLP3 \
(1 << 10) /* Poisoned Error Status Status in function 3, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT2 (1 << 9) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL2 (1 << 9) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT2 \
(1 << 8) /* Unsupported Request Error Status for Function 2, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4905,7 +4905,7 @@
#define PXPCS_TL_FUNC678_STAT 0x85C
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT7 (1 << 29) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL7 (1 << 29) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT7 \
(1 << 28) /* Unsupported Request Error Status in function7, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4936,7 +4936,7 @@
#define PXPCS_TL_FUNC678_STAT_ERR_PSND_TLP7 \
(1 << 20) /* Poisoned Error Status Status in function 7, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT6 (1 << 19) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL6 (1 << 19) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT6 \
(1 << 18) /* Unsupported Request Error Status in function6, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4967,7 +4967,7 @@
#define PXPCS_TL_FUNC678_STAT_ERR_PSND_TLP6 \
(1 << 10) /* Poisoned Error Status Status in function 6, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT5 (1 << 9) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL5 (1 << 9) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT5 \
(1 << 8) /* Unsupported Request Error Status for Function 5, if \
set, generate pcie_err_attn output when this error is seen. WC */
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 10/14] net/mlx5: replace abort with cancel
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (8 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 09/14] net/bnx2x: replace abort with cancel Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 11/14] net/softnic: " Stephen Hemminger
` (4 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Matan Azrad, Viacheslav Ovsiienko, Ori Kam,
Suanming Mou
Replace use of term abort with cancel in mlx5 common and driver code.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/common/mlx5/mlx5_common_mr.c | 6 +++---
drivers/common/mlx5/mlx5_prm.h | 4 ++--
drivers/net/mlx5/hws/mlx5dr_rule.c | 8 ++++----
drivers/net/mlx5/hws/mlx5dr_send.c | 2 +-
drivers/net/mlx5/hws/mlx5dr_send.h | 2 +-
drivers/net/mlx5/linux/mlx5_os.c | 4 ++--
drivers/net/mlx5/mlx5_rx.c | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 40ff9153bd8e..b383ee31683c 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -179,7 +179,7 @@ mr_btree_insert(struct mlx5_mr_btree *bt, struct mr_cache_entry *entry)
/* Find out the slot for insertion. */
if (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) {
DRV_LOG(DEBUG,
- "abort insertion to B-tree(%p): already exist at"
+ "insertion to B-tree(%p): already exist at"
" idx=%u [0x%" PRIxPTR ", 0x%" PRIxPTR ") lkey=0x%x",
(void *)bt, idx, entry->start, entry->end, entry->lkey);
/* Already exist, return. */
@@ -824,7 +824,7 @@ mlx5_mr_create_primary(void *pd,
rte_rwlock_write_lock(&share_cache->rwlock);
/*
* Check the address is really missing. If other thread already created
- * one or it is not found due to overflow, abort and return.
+ * one or it is not found due to overflow, cancel and return.
*/
if (mlx5_mr_lookup_cache(share_cache, entry, addr) != UINT32_MAX) {
/*
@@ -833,7 +833,7 @@ mlx5_mr_create_primary(void *pd,
* here again.
*/
mr_btree_insert(&share_cache->cache, entry);
- DRV_LOG(DEBUG, "Found MR for %p on final lookup, abort",
+ DRV_LOG(DEBUG, "Found MR for %p on final lookup ",
(void *)addr);
rte_rwlock_write_unlock(&share_cache->rwlock);
rte_mcfg_mem_read_unlock();
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 51f426c61408..fa17b8af1846 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -192,7 +192,7 @@
/* Tunnel packet bit in the CQE. */
#define MLX5_CQE_RX_TUNNEL_PACKET (1u << 0)
-/* Mask for LRO push flag in the CQE lro_tcppsh_abort_dupack field. */
+/* Mask for LRO push flag in the CQE lro_tcppsh_dupack field. */
#define MLX5_CQE_LRO_PUSH_MASK 0x40
/* Mask for L4 type in the CQE hdr_type_etc field. */
@@ -423,7 +423,7 @@ struct mlx5_cqe {
uint8_t pkt_info;
uint8_t rsvd0;
uint16_t wqe_id;
- uint8_t lro_tcppsh_abort_dupack;
+ uint8_t lro_tcppsh_dupack;
uint8_t lro_min_ttl;
uint16_t lro_tcp_win;
uint32_t lro_ack_seq_num;
diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c
index 931c68b1606d..70a779a7558b 100644
--- a/drivers/net/mlx5/hws/mlx5dr_rule.c
+++ b/drivers/net/mlx5/hws/mlx5dr_rule.c
@@ -391,7 +391,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
mlx5dr_rule_create_init(rule, &ste_attr, &apply, is_update);
/* Allocate dependent match WQE since rule might have dependent writes.
- * The queued dependent WQE can be later aborted or kept as a dependency.
+ * The queued dependent WQE can be later canceled or kept as a dependency.
* dep_wqe buffers (ctrl, data) are also reused for all STE writes.
*/
dep_wqe = mlx5dr_send_add_new_dep_wqe(queue);
@@ -413,7 +413,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
ret = mlx5dr_rule_alloc_action_ste(rule, attr);
if (ret) {
DR_LOG(ERR, "Failed to allocate action memory %d", ret);
- mlx5dr_send_abort_new_dep_wqe(queue);
+ mlx5dr_send_cancel_new_dep_wqe(queue);
return ret;
}
/* Skip RX/TX based on the dep_wqe init */
@@ -445,8 +445,8 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
if (action_stes || apply.require_dep)
break;
- /* Rule has no dependencies, abort dep_wqe and send WQE now */
- mlx5dr_send_abort_new_dep_wqe(queue);
+ /* Rule has no dependencies, cancel dep_wqe and send WQE now */
+ mlx5dr_send_cancel_new_dep_wqe(queue);
ste_attr.wqe_tag_is_jumbo = is_jumbo;
ste_attr.send_attr.notify_hw = !attr->burst;
ste_attr.send_attr.user_data = dep_wqe->user_data;
diff --git a/drivers/net/mlx5/hws/mlx5dr_send.c b/drivers/net/mlx5/hws/mlx5dr_send.c
index e58fdeb117f7..7c6ff3f5c75b 100644
--- a/drivers/net/mlx5/hws/mlx5dr_send.c
+++ b/drivers/net/mlx5/hws/mlx5dr_send.c
@@ -15,7 +15,7 @@ mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue)
return &send_sq->dep_wqe[idx];
}
-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue)
+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue)
{
queue->send_ring->send_sq.head_dep_idx--;
}
diff --git a/drivers/net/mlx5/hws/mlx5dr_send.h b/drivers/net/mlx5/hws/mlx5dr_send.h
index c1e8616f7e35..02ecf865ad6a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_send.h
+++ b/drivers/net/mlx5/hws/mlx5dr_send.h
@@ -220,7 +220,7 @@ mlx5dr_uar_write64_relaxed(uint64_t val, void *addr)
struct mlx5dr_send_ring_dep_wqe *
mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue);
-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue);
+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue);
void mlx5dr_send_all_dep_wqe(struct mlx5dr_send_engine *queue);
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index d8f1adfe3df0..26aed417724c 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2384,7 +2384,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
}
if (i != ns) {
DRV_LOG(ERR,
- "probe of PCI device " PCI_PRI_FMT " aborted after"
+ "probe of PCI device " PCI_PRI_FMT " canceled after"
" encountering an error: %s",
owner_pci.domain, owner_pci.bus,
owner_pci.devid, owner_pci.function,
@@ -2484,7 +2484,7 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev,
eth_da.ports[p], mkvlist);
if (ret) {
DRV_LOG(INFO, "Probe of PCI device " PCI_PRI_FMT " "
- "aborted due to proding failure of PF %u",
+ "canceled due to proding failure of PF %u",
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function,
eth_da.ports[p]);
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index 392784050f57..ceafa95555de 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1085,7 +1085,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
tcp->recv_ack = cqe->lro_ack_seq_num;
tcp->rx_win = cqe->lro_tcp_win;
}
- if (cqe->lro_tcppsh_abort_dupack & MLX5_CQE_LRO_PUSH_MASK)
+ if (cqe->lro_tcppsh_cancel_dupack & MLX5_CQE_LRO_PUSH_MASK)
tcp->tcp_flags |= RTE_TCP_PSH_FLAG;
tcp->cksum = 0;
csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4);
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 11/14] net/softnic: replace abort with cancel
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (9 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 10/14] net/mlx5: " Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 12/14] net/mlx4: remove word abort Stephen Hemminger
` (3 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Cristian Dumitrescu
The term abort is o the Tier 1 non-inclusive word list.
Replace it with cancel. This also impacts the CLI
for controlling this driver.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/softnic/rte_eth_softnic_cli.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c
index 085523fe0310..bdb89753696a 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1389,14 +1389,14 @@ cmd_softnic_pipeline_commit(struct pmd_internals *softnic,
status = rte_swx_ctl_pipeline_commit(p->ctl, 1);
if (status)
snprintf(out, out_size, "Commit failed. "
- "Use \"commit\" to retry or \"abort\" to discard the pending work.\n");
+ "Use \"commit\" to retry or \"cancel\" to discard the pending work.\n");
}
/**
- * pipeline <pipeline_name> abort
+ * pipeline <pipeline_name> cancel
*/
static void
-cmd_softnic_pipeline_abort(struct pmd_internals *softnic,
+cmd_softnic_pipeline_cancel(struct pmd_internals *softnic,
char **tokens,
uint32_t n_tokens,
char *out,
@@ -1417,7 +1417,7 @@ cmd_softnic_pipeline_abort(struct pmd_internals *softnic,
return;
}
- rte_swx_ctl_pipeline_abort(p->ctl);
+ rte_swx_ctl_pipeline_cancel(p->ctl);
}
/**
@@ -2428,8 +2428,8 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
return;
}
- if (n_tokens >= 3 && !strcmp(tokens[2], "abort")) {
- cmd_softnic_pipeline_abort(softnic, tokens, n_tokens, out, out_size);
+ if (n_tokens >= 3 && !strcmp(tokens[2], "cancel")) {
+ cmd_softnic_pipeline_cancel(softnic, tokens, n_tokens, out, out_size);
return;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 12/14] net/mlx4: remove word abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (10 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 11/14] net/softnic: " Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 13/14] sfc: remove use of term abort Stephen Hemminger
` (2 subsequent siblings)
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Matan Azrad, Viacheslav Ovsiienko
Avoid using the term abort since it is on Tier 1 word list.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/mlx4/mlx4_mr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index e95f45aa3e95..1bd47e05caeb 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -161,7 +161,7 @@ mr_btree_insert(struct mlx4_mr_btree *bt, struct mlx4_mr_cache *entry)
lkp_tbl = *bt->table;
/* Find out the slot for insertion. */
if (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) {
- DEBUG("abort insertion to B-tree(%p): already exist at"
+ DEBUG("insertion to B-tree(%p): already exist at"
" idx=%u [0x%" PRIxPTR ", 0x%" PRIxPTR ") lkey=0x%x",
(void *)bt, idx, entry->start, entry->end, entry->lkey);
/* Already exist, return. */
@@ -720,7 +720,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
rte_rwlock_write_lock(&priv->mr.rwlock);
/*
* Check the address is really missing. If other thread already created
- * one or it is not found due to overflow, abort and return.
+ * one or it is not found due to overflow, cancel and return.
*/
if (mr_lookup_dev(dev, entry, addr) != UINT32_MAX) {
/*
@@ -729,7 +729,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
* here again.
*/
mr_btree_insert(&priv->mr.cache, entry);
- DEBUG("port %u found MR for %p on final lookup, abort",
+ DEBUG("port %u found MR for %p on final lookup",
dev->data->port_id, (void *)addr);
rte_rwlock_write_unlock(&priv->mr.rwlock);
rte_mcfg_mem_read_unlock();
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 13/14] sfc: remove use of term abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (11 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 12/14] net/mlx4: remove word abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 2:52 ` [PATCH 14/14] net/axgbe: replace word abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Andrew Rybchenko
Replace abort with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/sfc_efx_mcdi.c | 6 +++---
drivers/common/sfc_efx/version.map | 2 +-
drivers/net/sfc/sfc_ef10_rx.c | 2 +-
drivers/net/sfc/sfc_ev.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index 41fa3da76229..098e805daa26 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -548,7 +548,7 @@ typedef struct efsys_bar_s {
* (required by PIO hardware).
*
* Neither VFIO, nor UIO, nor NIC UIO (on FreeBSD) support
- * write-combined memory mapped to user-land, so just abort if used.
+ * write-combined memory mapped to user-land, so just cancel if used.
*/
#define EFSYS_BAR_WC_WRITEQ(_esbp, _offset, _eqp) \
do { \
diff --git a/drivers/common/sfc_efx/sfc_efx_mcdi.c b/drivers/common/sfc_efx/sfc_efx_mcdi.c
index 0d17616589bb..e1ba70945474 100644
--- a/drivers/common/sfc_efx/sfc_efx_mcdi.c
+++ b/drivers/common/sfc_efx/sfc_efx_mcdi.c
@@ -76,7 +76,7 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
efx_nic_t *enp;
unsigned int delay_total;
unsigned int delay_us;
- boolean_t aborted __rte_unused;
+ boolean_t canceled __rte_unused;
delay_total = 0;
delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;
@@ -93,8 +93,8 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
if (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) {
if (!proxy) {
- aborted = efx_mcdi_request_abort(enp);
- SFC_EFX_ASSERT(aborted);
+ canceled = efx_mcdi_request_cancel(enp);
+ SFC_EFX_ASSERT(canceled);
sfc_efx_mcdi_timeout(mcdi);
}
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 40c97ad2b483..4f8f96e7b74b 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -165,7 +165,7 @@ INTERNAL {
efx_mcdi_mport_alloc_alias;
efx_mcdi_new_epoch;
efx_mcdi_reboot;
- efx_mcdi_request_abort;
+ efx_mcdi_request_cancel;
efx_mcdi_request_poll;
efx_mcdi_request_start;
diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c
index 30a320d0791c..a8676d064618 100644
--- a/drivers/net/sfc/sfc_ef10_rx.c
+++ b/drivers/net/sfc/sfc_ef10_rx.c
@@ -265,7 +265,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,
EFX_MASK32(ESF_DZ_RX_DSC_PTR_LBITS);
if (ready == 0) {
- /* Rx abort - it was no enough descriptors for Rx packet */
+ /* Rx cancel - it was no enough descriptors for Rx packet */
rte_pktmbuf_free(rxq->scatter_pkt);
rxq->scatter_pkt = NULL;
return rx_pkts;
diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index c0d58c9554ce..678c76acef50 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -104,13 +104,13 @@ sfc_ev_efx_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
if (delta == 0) {
/*
* Rx event with no new descriptors done and zero length
- * is used to abort scattered packet when there is no room
+ * is used to cancel scattered packet when there is no room
* for the tail.
*/
if (unlikely(size != 0)) {
evq->exception = B_TRUE;
sfc_err(evq->sa,
- "EVQ %u RxQ %u invalid RX abort "
+ "EVQ %u RxQ %u invalid RX cancel "
"(id=%#x size=%u flags=%#x); needs restart",
evq->evq_index, rxq->dp.dpq.queue_id,
id, size, flags);
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 14/14] net/axgbe: replace word abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (12 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 13/14] sfc: remove use of term abort Stephen Hemminger
@ 2023-08-18 2:52 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
14 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 2:52 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Chandubabu Namburu
Use cancel instead of abort.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/axgbe/axgbe_common.h | 4 ++--
drivers/net/axgbe/axgbe_ethdev.h | 2 +-
drivers/net/axgbe/axgbe_i2c.c | 26 +++++++++++++-------------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h
index a5d11c583210..9180848f525c 100644
--- a/drivers/net/axgbe/axgbe_common.h
+++ b/drivers/net/axgbe/axgbe_common.h
@@ -1123,8 +1123,8 @@
#define IC_DATA_CMD_CMD_WIDTH 1
#define IC_DATA_CMD_STOP_INDEX 9
#define IC_DATA_CMD_STOP_WIDTH 1
-#define IC_ENABLE_ABORT_INDEX 1
-#define IC_ENABLE_ABORT_WIDTH 1
+#define IC_ENABLE_CANCEL_INDEX 1
+#define IC_ENABLE_CANCEL_WIDTH 1
#define IC_ENABLE_EN_INDEX 0
#define IC_ENABLE_EN_WIDTH 1
#define IC_ENABLE_STATUS_EN_INDEX 0
diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index 7f19321d881b..513b083c3b8b 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -271,7 +271,7 @@ struct axgbe_i2c_op_state {
unsigned int rx_len;
unsigned char *rx_buf;
- unsigned int tx_abort_source;
+ unsigned int tx_cancel_source;
int ret;
};
diff --git a/drivers/net/axgbe/axgbe_i2c.c b/drivers/net/axgbe/axgbe_i2c.c
index a2798f484e72..917867f60b27 100644
--- a/drivers/net/axgbe/axgbe_i2c.c
+++ b/drivers/net/axgbe/axgbe_i2c.c
@@ -6,7 +6,7 @@
#include "axgbe_ethdev.h"
#include "axgbe_common.h"
-#define AXGBE_ABORT_COUNT 500
+#define AXGBE_CANCEL_COUNT 500
#define AXGBE_DISABLE_COUNT 1000
#define AXGBE_STD_SPEED 1
@@ -23,18 +23,18 @@
#define AXGBE_I2C_READ BIT(8)
#define AXGBE_I2C_STOP BIT(9)
-static int axgbe_i2c_abort(struct axgbe_port *pdata)
+static int axgbe_i2c_cancel(struct axgbe_port *pdata)
{
- unsigned int wait = AXGBE_ABORT_COUNT;
+ unsigned int wait = AXGBE_CANCEL_COUNT;
- /* Must be enabled to recognize the abort request */
+ /* Must be enabled to recognize the cancel request */
XI2C_IOWRITE_BITS(pdata, IC_ENABLE, EN, 1);
- /* Issue the abort */
- XI2C_IOWRITE_BITS(pdata, IC_ENABLE, ABORT, 1);
+ /* Issue the cancel */
+ XI2C_IOWRITE_BITS(pdata, IC_ENABLE, CANCEL, 1);
while (wait--) {
- if (!XI2C_IOREAD_BITS(pdata, IC_ENABLE, ABORT))
+ if (!XI2C_IOREAD_BITS(pdata, IC_ENABLE, CANCEL))
return 0;
rte_delay_us(500);
}
@@ -64,8 +64,8 @@ static int axgbe_i2c_disable(struct axgbe_port *pdata)
ret = axgbe_i2c_set_enable(pdata, false);
if (ret) {
- /* Disable failed, try an abort */
- ret = axgbe_i2c_abort(pdata);
+ /* Disable failed, try an cancel */
+ ret = axgbe_i2c_cancel(pdata);
if (ret)
return ret;
@@ -147,7 +147,7 @@ static void axgbe_i2c_clear_isr_interrupts(struct axgbe_port *pdata,
struct axgbe_i2c_op_state *state = &pdata->i2c.op_state;
if (isr & AXGBE_INTR_TX_ABRT) {
- state->tx_abort_source = XI2C_IOREAD(pdata, IC_TX_ABRT_SOURCE);
+ state->tx_cancel_source = XI2C_IOREAD(pdata, IC_TX_ABRT_SOURCE);
XI2C_IOREAD(pdata, IC_CLR_TX_ABRT);
}
@@ -169,7 +169,7 @@ static int axgbe_i2c_isr(struct axgbe_port *pdata)
if (isr & AXGBE_INTR_TX_ABRT) {
PMD_DRV_LOG(DEBUG,
"I2C TX_ABRT received (%#010x) for target %#04x\n",
- state->tx_abort_source, state->op->target);
+ state->tx_cancel_source, state->op->target);
axgbe_i2c_disable_interrupts(pdata);
@@ -277,9 +277,9 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
success:
ret = state->ret;
if (ret) {
- if (state->tx_abort_source & IC_TX_ABRT_7B_ADDR_NOACK)
+ if (state->tx_cancel_source & IC_TX_ABRT_7B_ADDR_NOACK)
ret = -ENOTCONN;
- else if (state->tx_abort_source & IC_TX_ABRT_ARB_LOST)
+ else if (state->tx_cancel_source & IC_TX_ABRT_ARB_LOST)
ret = -EAGAIN;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 00/13] Replace us of term abort
2023-08-18 2:52 [PATCH 00/14] remove use of term abort Stephen Hemminger
` (13 preceding siblings ...)
2023-08-18 2:52 ` [PATCH 14/14] net/axgbe: replace word abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
` (13 more replies)
14 siblings, 14 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
The term 'abort' is on the inclusive namin Tier 1 word list
as replace when possible. It is possible to do this across
DPDK except the few places that directly call the lib C abort()
function.
v2 - drop changes to sfc since requires changes to base driver
- cleanup some checkpatch and missing spots
Rationale (from https://inclusivenaming.org/word-lists/tier-1/abort/)
The term “abort” frequently appeared in Inclusive Language
Initiative surveys and standards reviews. Multiple organizations felt
that usage of the word posed an issue worth addressing in their
individual companies and projects. Given this widespread interest, the
INI has decided to offer its own guidance.
INI recommends replacing “abort” wherever possible. In accordance with
the INI’s language framework, the term does not necessarily constitute
a first-order concern. However, because it is such a charged term
outside of computing, “abort” fails to provide a clear description of
the action being taken, and serves primarily to distract. There are
numerous other words in the English language that can serve the same
purpose in computing without invoking the emotionally charged cultural
context of “abort.”
Although the INI debated whether the word “abort” itself or the
procedure commonly associated with it (“abortion”) caused the
aforementioned distractions, the etymology of the word has a direct
and unambiguous link to the termination of a pregnancy. Alternative
uses of the word “abort” are in use today, such as in
rocketry. However, the INI concluded that the term itself was
insufficiently distanced from its original meaning for those
alternative definitions to be its primary association.
All this being said, the INI does not advocate for a blanket
replacement of the term. “Abort” appears in many standards
organization documents, and is deeply embedded in some operating
systems. As such, the INI acknowledges that the term may need to
be retained in certain contexts to remain in compliance with those
standards, or to preserve accurate documentation for bedrock
functions and processes that are too fundamental to be changed.
Some organizations have noted that using “abort” in contexts other
than the medical or political serves to de-stigmatize the term,
thereby promoting reproductive rights and bodily autonomy. Conversely,
discouraging the term could be interpreted as accepting a framing that
denies a pregnant person’s right to control their body. The judgment
of the INI is that the term causes discomfort or offense without
providing a necessary degree of technical clarity, and therefore it
should be avoided. At some future point, because language changes over
time, “abort” may become a less contentious term; at that juncture,
the appropriateness of the term may be revisited.
Stephen Hemminger (13):
jobstats: change jobstats_abort to jobstats_cancel
all: remove use of word abort
pipeline: remove use of term abort
net/vmxnet3: replace abort() with rte_panic()
event/dlb2: remove word abort in comments
net/vdev_netvsc: replace use of term abort
net/netvsc: replace abort with cancel
net/ionic: remove word aborting
net/bnx2x: replace abort with cancel
net/mlx5: replace abort with cancel
net/softnic: replace abort with cancel
net/mlx4: remove word abort
net/axgbe: replace word abort
.../comp_perf_test_cyclecount.c | 2 +-
.../comp_perf_test_throughput.c | 2 +-
.../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/common/mlx5/mlx5_common_mr.c | 6 ++--
drivers/common/mlx5/mlx5_prm.h | 4 +--
drivers/dma/hisilicon/hisi_dmadev.c | 4 +--
drivers/dma/hisilicon/hisi_dmadev.h | 2 +-
drivers/event/dlb2/dlb2.c | 2 +-
drivers/event/dlb2/pf/base/dlb2_resource.c | 2 +-
drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
drivers/net/axgbe/axgbe_common.h | 4 +--
drivers/net/axgbe/axgbe_ethdev.h | 2 +-
drivers/net/axgbe/axgbe_i2c.c | 26 ++++++++---------
drivers/net/bnx2x/bnx2x.c | 18 ++++++------
drivers/net/bnx2x/bnx2x_vfpf.c | 4 +--
drivers/net/bnx2x/ecore_hsi.h | 6 ++--
drivers/net/bnx2x/ecore_reg.h | 20 ++++++-------
drivers/net/ionic/ionic_dev_pci.c | 6 ++--
drivers/net/ionic/ionic_ethdev.c | 18 ++++++------
drivers/net/ionic/ionic_lif.c | 2 +-
drivers/net/mlx4/mlx4_mr.c | 6 ++--
drivers/net/mlx5/hws/mlx5dr_rule.c | 8 ++---
drivers/net/mlx5/hws/mlx5dr_send.c | 2 +-
drivers/net/mlx5/hws/mlx5dr_send.h | 2 +-
drivers/net/mlx5/linux/mlx5_os.c | 4 +--
drivers/net/mlx5/mlx5_rx.c | 2 +-
drivers/net/netvsc/rndis.h | 2 +-
drivers/net/softnic/rte_eth_softnic_cli.c | 12 ++++----
drivers/net/vdev_netvsc/vdev_netvsc.c | 4 +--
drivers/net/vmxnet3/vmxnet3_rxtx.c | 6 ++--
examples/ipsec-secgw/rt.c | 4 +--
examples/l2fwd-jobstats/main.c | 2 +-
examples/pipeline/cli.c | 20 ++++++-------
lib/dmadev/rte_dmadev.h | 6 ++--
.../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/jobstats/rte_jobstats.c | 2 +-
lib/jobstats/rte_jobstats.h | 9 +++++-
lib/jobstats/version.map | 2 +-
lib/pipeline/rte_swx_ctl.c | 29 ++++++++++---------
lib/pipeline/rte_swx_ctl.h | 8 ++---
lib/pipeline/version.map | 2 +-
lib/ring/rte_ring_peek_elem_pvt.h | 4 +--
53 files changed, 174 insertions(+), 166 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 02/13] all: remove use of word abort Stephen Hemminger
` (12 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger
The term abort is on the "Replace now" list of words.
Use cancel instead.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
examples/l2fwd-jobstats/main.c | 2 +-
lib/jobstats/rte_jobstats.c | 2 +-
lib/jobstats/rte_jobstats.h | 9 ++++++++-
lib/jobstats/version.map | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index 2653db473538..a3b604e307e1 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -534,7 +534,7 @@ l2fwd_main_loop(void)
if (likely(repeats != 1))
rte_jobstats_finish(&qconf->idle_job, qconf->idle_job.target);
else
- rte_jobstats_abort(&qconf->idle_job);
+ rte_jobstats_cancel(&qconf->idle_job);
rte_timer_manage();
rte_jobstats_context_finish(&qconf->jobs_context);
diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
index af565a14eaf3..d8c17f135471 100644
--- a/lib/jobstats/rte_jobstats.c
+++ b/lib/jobstats/rte_jobstats.c
@@ -139,7 +139,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job)
}
int
-rte_jobstats_abort(struct rte_jobstats *job)
+rte_jobstats_cancel(struct rte_jobstats *job)
{
struct rte_jobstats_context *ctx;
uint64_t now, exec_time;
diff --git a/lib/jobstats/rte_jobstats.h b/lib/jobstats/rte_jobstats.h
index 45b460e6030a..89294d181592 100644
--- a/lib/jobstats/rte_jobstats.h
+++ b/lib/jobstats/rte_jobstats.h
@@ -218,7 +218,14 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct rte_jobstats *job);
* -EINVAL if job is NULL or job was not started (it have no context).
*/
int
-rte_jobstats_abort(struct rte_jobstats *job);
+rte_jobstats_cancel(struct rte_jobstats *job);
+
+__rte_deprecated
+static inline int
+rte_jobstats_abort(struct rte_jobstats *job)
+{
+ return rte_jobstats_cancel(job);
+}
/**
* Mark that *job* finished its execution. Context in which it was executing
diff --git a/lib/jobstats/version.map b/lib/jobstats/version.map
index 3b8f9d6ac464..c334033a6048 100644
--- a/lib/jobstats/version.map
+++ b/lib/jobstats/version.map
@@ -1,7 +1,7 @@
DPDK_24 {
global:
- rte_jobstats_abort;
+ rte_jobstats_cancel;
rte_jobstats_context_finish;
rte_jobstats_context_init;
rte_jobstats_context_reset;
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 02/13] all: remove use of word abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 03/13] pipeline: remove use of term abort Stephen Hemminger
` (11 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Chengwen Feng, Kevin Laatz, Bruce Richardson,
Konstantin Ananyev, Ciara Loftus, Qi Zhang, Radu Nicolau,
Akhil Goyal, Mattias Rönnblom, Cristian Dumitrescu,
Thomas Monjalon, Ferruh Yigit, Andrew Rybchenko, Yipeng Wang,
Sameh Gobriel, Vladimir Medvedkin, Honnappa Nagarahalli
The term abort is on the Tier 1 "replace immediately" list.
Signed-off-by: Stephen Hemminger <stephen@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
* 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..18764724be1e 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 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 result in canceling any pending changes and
* return head to its previous position.
* - throw an assert in debug mode.
*/
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 03/13] pipeline: remove use of term abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 02/13] all: remove use of word abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
` (10 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Cristian Dumitrescu
Replace with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
examples/pipeline/cli.c | 20 ++++++++++----------
lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++--------------
lib/pipeline/rte_swx_ctl.h | 8 ++++----
lib/pipeline/version.map | 2 +-
4 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c
index 2ae6cc579ff2..090e5e470106 100644
--- a/examples/pipeline/cli.c
+++ b/examples/pipeline/cli.c
@@ -1778,14 +1778,14 @@ cmd_pipeline_commit(char **tokens,
status = rte_swx_ctl_pipeline_commit(ctl, 1);
if (status)
snprintf(out, out_size, "Commit failed. "
- "Use \"commit\" to retry or \"abort\" to discard the pending work.\n");
+ "Use \"commit\" to retry or \"cancel\" to discard the pending work.\n");
}
-static const char cmd_pipeline_abort_help[] =
-"pipeline <pipeline_name> abort\n";
+static const char cmd_pipeline_cancel_help[] =
+"pipeline <pipeline_name> cancel\n";
static void
-cmd_pipeline_abort(char **tokens,
+cmd_pipeline_cancel(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size,
@@ -1806,7 +1806,7 @@ cmd_pipeline_abort(char **tokens,
return;
}
- rte_swx_ctl_pipeline_abort(ctl);
+ rte_swx_ctl_pipeline_cancel(ctl);
}
static const char cmd_pipeline_regrd_help[] =
@@ -3474,8 +3474,8 @@ cmd_help(char **tokens,
"\tpipeline selector group member delete\n"
"\tpipeline selector show\n"
"\tpipeline learner default\n"
+ "\tpipeline cancel\n"
"\tpipeline commit\n"
- "\tpipeline abort\n"
"\tpipeline regrd\n"
"\tpipeline regwr\n"
"\tpipeline meter profile add\n"
@@ -3648,9 +3648,9 @@ cmd_help(char **tokens,
if ((strcmp(tokens[0], "pipeline") == 0) &&
(n_tokens == 2) &&
- (strcmp(tokens[1], "abort") == 0)) {
+ (strcmp(tokens[1], "cancel") == 0)) {
snprintf(out, out_size, "\n%s\n",
- cmd_pipeline_abort_help);
+ cmd_pipeline_cancel_help);
return;
}
@@ -3934,8 +3934,8 @@ cli_process(char *in, char *out, size_t out_size, void *obj)
}
if ((n_tokens >= 3) &&
- (strcmp(tokens[2], "abort") == 0)) {
- cmd_pipeline_abort(tokens, n_tokens, out,
+ (strcmp(tokens[2], "cancel") == 0)) {
+ cmd_pipeline_cancel(tokens, n_tokens, out,
out_size, obj);
return;
}
diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index 857770d297a4..41d07e9b3a19 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -2063,7 +2063,7 @@ table_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
* failed commit operation to remove ALL the pending work for ALL the tables.
*/
static void
-table_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
+table_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
{
struct table *table = &ctl->tables[table_id];
@@ -2366,7 +2366,7 @@ selector_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
}
static void
-selector_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
+selector_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id)
{
struct selector *s = &ctl->selectors[selector_id];
uint32_t group_id;
@@ -2545,7 +2545,7 @@ learner_rollfwd_finalize(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
}
static void
-learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
+learner_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
{
struct learner *l = &ctl->learners[learner_id];
@@ -2554,7 +2554,8 @@ learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id)
}
int
-rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)
+rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
+ int cancel_on_fail)
{
struct rte_swx_table_state *ts;
int status = 0;
@@ -2622,25 +2623,25 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail)
rollback:
for (i = 0; i < ctl->info.n_tables; i++) {
table_rollback(ctl, i);
- if (abort_on_fail)
- table_abort(ctl, i);
+ if (cancel_on_fail)
+ table_cancel(ctl, i);
}
for (i = 0; i < ctl->info.n_selectors; i++) {
selector_rollback(ctl, i);
- if (abort_on_fail)
- selector_abort(ctl, i);
+ if (cancel_on_fail)
+ selector_cancel(ctl, i);
}
- if (abort_on_fail)
+ if (cancel_on_fail)
for (i = 0; i < ctl->info.n_learners; i++)
- learner_abort(ctl, i);
+ learner_cancel(ctl, i);
return status;
}
void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl)
{
uint32_t i;
@@ -2648,13 +2649,13 @@ rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl)
return;
for (i = 0; i < ctl->info.n_tables; i++)
- table_abort(ctl, i);
+ table_cancel(ctl, i);
for (i = 0; i < ctl->info.n_selectors; i++)
- selector_abort(ctl, i);
+ selector_cancel(ctl, i);
for (i = 0; i < ctl->info.n_learners; i++)
- learner_abort(ctl, i);
+ learner_cancel(ctl, i);
}
static int
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 6ef2551ab534..14973b74172b 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -1045,7 +1045,7 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,
*
* @param[in] ctl
* Pipeline control handle.
- * @param[in] abort_on_fail
+ * @param[in] revert_on_fail
* When non-zero (false), all the scheduled work is discarded after a failed
* commit. Otherwise, the scheduled work is still kept pending for the next
* commit.
@@ -1056,10 +1056,10 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl,
__rte_experimental
int
rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
- int abort_on_fail);
+ int revert_on_fail);
/**
- * Pipeline abort
+ * Pipeline cancel
*
* Discard all the scheduled table work.
*
@@ -1068,7 +1068,7 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl,
*/
__rte_experimental
void
-rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl);
+rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl);
/**
* Pipeline table entry read
diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map
index 6997b69340ef..1ddd598fa079 100644
--- a/lib/pipeline/version.map
+++ b/lib/pipeline/version.map
@@ -62,7 +62,7 @@ EXPERIMENTAL {
# added in 20.11
rte_swx_ctl_action_arg_info_get;
rte_swx_ctl_action_info_get;
- rte_swx_ctl_pipeline_abort;
+ rte_swx_ctl_pipeline_cancel;
rte_swx_ctl_pipeline_commit;
rte_swx_ctl_pipeline_create;
rte_swx_ctl_pipeline_free;
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic()
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (2 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 03/13] pipeline: remove use of term abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 05/13] event/dlb2: remove word abort in comments Stephen Hemminger
` (9 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Jochen Behrens
Do the same thing but be better about wording.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vmxnet3/vmxnet3_rxtx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 380f41f98be2..695a1877185f 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -565,9 +565,9 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
dgram_cksum);
break;
default:
- PMD_TX_LOG(WARNING, "requested cksum offload not supported %#llx",
- txm->ol_flags & RTE_MBUF_F_TX_L4_MASK);
- abort();
+ /* should probably count as tx error and drop instead */
+ rte_panic("unsupported cksum offload: %"PRIx64"\n",
+ txm->ol_flags);
}
deferred++;
} else {
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 05/13] event/dlb2: remove word abort in comments
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (3 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort Stephen Hemminger
` (8 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Timothy McDaniel
Abort is on the Tier 1 non-inclusive word list.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/event/dlb2/dlb2.c | 2 +-
drivers/event/dlb2/pf/base/dlb2_resource.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 60c5cd48040e..d1a7c58721c5 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -3317,7 +3317,7 @@ static int
dlb2_monitor_callback(const uint64_t val,
const uint64_t opaque[RTE_POWER_MONITOR_OPAQUE_SZ])
{
- /* abort if the value matches */
+ /* terminat if the value matches */
return (val & opaque[CLB_MASK_IDX]) == opaque[CLB_VAL_IDX] ? -1 : 0;
}
diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c b/drivers/event/dlb2/pf/base/dlb2_resource.c
index dd8390a01320..05171c86aa06 100644
--- a/drivers/event/dlb2/pf/base/dlb2_resource.c
+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c
@@ -5941,7 +5941,7 @@ int dlb2_hw_unmap_qid(struct dlb2_hw *hw,
st = DLB2_QUEUE_MAP_IN_PROG;
if (dlb2_port_find_slot_queue(port, st, queue, &i)) {
/*
- * Since the in-progress map was aborted, re-enable the QID's
+ * Since the in-progress map was terminated, re-enable the QID's
* inflights.
*/
if (queue->num_pending_additions == 0)
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (4 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 05/13] event/dlb2: remove word abort in comments Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 07/13] net/netvsc: replace abort with cancel Stephen Hemminger
` (7 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Matan Azrad
Replace abort with cancel.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/vdev_netvsc/vdev_netvsc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index c3e045d892b7..1a9c03c0f0b1 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -141,7 +141,7 @@ vdev_netvsc_iface_is_netvsc(const struct if_nameindex *iface)
* the system.
*
* @param func
- * Callback function pointer. List traversal is aborted when this function
+ * Callback function pointer. List traversal is terminated when this function
* returns a nonzero value.
* @param is_netvsc
* Indicates the device type to iterate - netvsc or non-netvsc.
@@ -151,7 +151,7 @@ vdev_netvsc_iface_is_netvsc(const struct if_nameindex *iface)
* @return
* 0 when the entire list is traversed successfully, a negative error code
* in case or failure, or the nonzero value returned by @p func when list
- * traversal is aborted.
+ * traversal is terminated.
*/
static int
vdev_netvsc_foreach_iface(int (*func)(const struct if_nameindex *iface,
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 07/13] net/netvsc: replace abort with cancel
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (5 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 22:26 ` Long Li
2023-08-18 17:45 ` [PATCH v2 08/13] net/ionic: remove word aborting Stephen Hemminger
` (6 subsequent siblings)
13 siblings, 1 reply; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Long Li
Replace abort with cancel in netvsc.
The rndis.h was inherited from FreeBSD driver, but ok to change
it here.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/netvsc/rndis.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/rndis.h b/drivers/net/netvsc/rndis.h
index eac9a99fd8ef..d2e9388ae484 100644
--- a/drivers/net/netvsc/rndis.h
+++ b/drivers/net/netvsc/rndis.h
@@ -49,7 +49,7 @@
#define RNDIS_STATUS_MULTICAST_FULL 0xC0010009
#define RNDIS_STATUS_MULTICAST_EXISTS 0xC001000A
#define RNDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B
-#define RNDIS_STATUS_REQUEST_ABORTED 0xC001000C
+#define RNDIS_STATUS_REQUEST_CANCELED 0xC001000C
#define RNDIS_STATUS_RESET_IN_PROGRESS 0xC001000D
#define RNDIS_STATUS_CLOSING_INDICATING 0xC001000E
#define RNDIS_STATUS_INVALID_PACKET 0xC001000F
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* RE: [PATCH v2 07/13] net/netvsc: replace abort with cancel
2023-08-18 17:45 ` [PATCH v2 07/13] net/netvsc: replace abort with cancel Stephen Hemminger
@ 2023-08-18 22:26 ` Long Li
0 siblings, 0 replies; 37+ messages in thread
From: Long Li @ 2023-08-18 22:26 UTC (permalink / raw)
To: Stephen Hemminger, dev
> Subject: [PATCH v2 07/13] net/netvsc: replace abort with cancel
>
> Replace abort with cancel in netvsc.
> The rndis.h was inherited from FreeBSD driver, but ok to change it here.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> drivers/net/netvsc/rndis.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/netvsc/rndis.h b/drivers/net/netvsc/rndis.h index
> eac9a99fd8ef..d2e9388ae484 100644
> --- a/drivers/net/netvsc/rndis.h
> +++ b/drivers/net/netvsc/rndis.h
> @@ -49,7 +49,7 @@
> #define RNDIS_STATUS_MULTICAST_FULL 0xC0010009
> #define RNDIS_STATUS_MULTICAST_EXISTS 0xC001000A
> #define RNDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B
> -#define RNDIS_STATUS_REQUEST_ABORTED 0xC001000C
> +#define RNDIS_STATUS_REQUEST_CANCELED 0xC001000C
> #define RNDIS_STATUS_RESET_IN_PROGRESS 0xC001000D
> #define RNDIS_STATUS_CLOSING_INDICATING 0xC001000E
> #define RNDIS_STATUS_INVALID_PACKET 0xC001000F
> --
> 2.39.2
Acked-by: Long Li <longli@microsoft.com>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v2 08/13] net/ionic: remove word aborting
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (6 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 07/13] net/netvsc: replace abort with cancel Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 09/13] net/bnx2x: replace abort with cancel Stephen Hemminger
` (5 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Andrew Boyer
Since abort is on the Tier 1 list of words to replace;
just remove the unnecessary part of the log message.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/ionic/ionic_dev_pci.c | 6 +++---
drivers/net/ionic/ionic_ethdev.c | 18 +++++++++---------
drivers/net/ionic/ionic_lif.c | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ionic/ionic_dev_pci.c b/drivers/net/ionic/ionic_dev_pci.c
index 5e74a6da7149..aec76b6f0024 100644
--- a/drivers/net/ionic/ionic_dev_pci.c
+++ b/drivers/net/ionic/ionic_dev_pci.c
@@ -43,13 +43,13 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR0: dev_cmd and interrupts */
if (num_bars < 1) {
- IONIC_PRINT(ERR, "No bars found, aborting\n");
+ IONIC_PRINT(ERR, "No bars found\n");
return -EFAULT;
}
if (bar->len < IONIC_BAR0_SIZE) {
IONIC_PRINT(ERR,
- "Resource bar size %lu too small, aborting\n",
+ "Resource bar size %lu too small\n",
bar->len);
return -EFAULT;
}
@@ -84,7 +84,7 @@ ionic_pci_setup(struct ionic_adapter *adapter)
/* BAR1: doorbells */
bar++;
if (num_bars < 2) {
- IONIC_PRINT(ERR, "Doorbell bar missing, aborting\n");
+ IONIC_PRINT(ERR, "Doorbell bar missing\n");
return -EFAULT;
}
diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 340fd0cd5923..2eee70d226dd 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -1030,14 +1030,14 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)
err = ionic_lif_alloc(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot allocate LIFs: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot allocate LIFs: %d",
err);
goto err;
}
err = ionic_lif_init(lif);
if (err) {
- IONIC_PRINT(ERR, "Cannot init LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init LIFs: %d", err);
goto err_free_lif;
}
@@ -1144,48 +1144,48 @@ eth_ionic_dev_probe(void *bus_dev, struct rte_device *rte_dev,
/* Discover ionic dev resources */
err = ionic_setup(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot setup device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot setup device: %d", err);
goto err_free_adapter;
}
err = ionic_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify device: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify device: %d",
err);
goto err_free_adapter;
}
err = ionic_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init device: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init device: %d", err);
goto err_free_adapter;
}
/* Configure the ports */
err = ionic_port_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify port: %d, aborting",
+ IONIC_PRINT(ERR, "Cannot identify port: %d",
err);
goto err_free_adapter;
}
err = ionic_port_init(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot init port: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot init port: %d", err);
goto err_free_adapter;
}
/* Configure LIFs */
err = ionic_lif_identify(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot identify lif: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot identify lif: %d", err);
goto err_free_adapter;
}
/* Allocate and init LIFs */
err = ionic_lifs_size(adapter);
if (err) {
- IONIC_PRINT(ERR, "Cannot size LIFs: %d, aborting", err);
+ IONIC_PRINT(ERR, "Cannot size LIFs: %d", err);
goto err_free_adapter;
}
diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 25b490deb626..1944205428bc 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -1045,7 +1045,7 @@ ionic_lif_alloc(struct ionic_lif *lif)
lif->kern_dbpage = adapter->idev.db_pages;
if (!lif->kern_dbpage) {
- IONIC_PRINT(ERR, "Cannot map dbpage, aborting");
+ IONIC_PRINT(ERR, "Cannot map dbpage");
return -ENOMEM;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 09/13] net/bnx2x: replace abort with cancel
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (7 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 08/13] net/ionic: remove word aborting Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 10/13] net/mlx5: " Stephen Hemminger
` (4 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Julien Aube
Don't use the term abort.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/bnx2x/bnx2x.c | 18 +++++++++---------
drivers/net/bnx2x/bnx2x_vfpf.c | 4 ++--
drivers/net/bnx2x/ecore_hsi.h | 6 +++---
drivers/net/bnx2x/ecore_reg.h | 20 ++++++++++----------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 29c16bb207c7..5de0e5a65da1 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2746,13 +2746,13 @@ static int bnx2x_nic_load_request(struct bnx2x_softc *sc, uint32_t * load_code)
(*load_code) = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_REQ,
DRV_MSG_CODE_LOAD_REQ_WITH_LFA);
- /* if the MCP fails to respond we must abort */
+ /* if the MCP fails to respond we must exit */
if (!(*load_code)) {
PMD_DRV_LOG(NOTICE, sc, "MCP response failure!");
return -1;
}
- /* if MCP refused then must abort */
+ /* if MCP refused then must exit */
if ((*load_code) == FW_MSG_CODE_DRV_LOAD_REFUSED) {
PMD_DRV_LOG(NOTICE, sc, "MCP refused load request");
return -1;
@@ -2784,7 +2784,7 @@ static int bnx2x_nic_load_analyze_req(struct bnx2x_softc *sc, uint32_t load_code
PMD_DRV_LOG(DEBUG, sc, "loaded FW 0x%08x / my FW 0x%08x",
loaded_fw, my_fw);
- /* abort nic load if version mismatch */
+ /* stop nic load if version mismatch */
if (my_fw != loaded_fw) {
PMD_DRV_LOG(NOTICE, sc,
"FW 0x%08x already loaded (mine is 0x%08x)",
@@ -6324,7 +6324,7 @@ static int bnx2x_leader_reset(struct bnx2x_softc *sc)
load_code = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_REQ,
DRV_MSG_CODE_LOAD_REQ_WITH_LFA);
if (!load_code) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
goto exit_leader_reset;
}
@@ -6332,14 +6332,14 @@ static int bnx2x_leader_reset(struct bnx2x_softc *sc)
if ((load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP) &&
(load_code != FW_MSG_CODE_DRV_LOAD_COMMON)) {
PMD_DRV_LOG(NOTICE, sc,
- "MCP unexpected response, aborting");
+ "MCP unexpected response");
rc = -1;
goto exit_leader_reset2;
}
load_code = bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_DONE, 0);
if (!load_code) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
goto exit_leader_reset2;
}
@@ -7325,7 +7325,7 @@ int bnx2x_nic_load(struct bnx2x_softc *sc)
bnx2x_fw_command(sc, DRV_MSG_CODE_LOAD_DONE, 0);
if (!load_code) {
PMD_DRV_LOG(NOTICE, sc,
- "MCP response failure, aborting");
+ "MCP response failure");
sc->state = BNX2X_STATE_ERROR;
rc = -ENXIO;
goto bnx2x_nic_load_error3;
@@ -9091,7 +9091,7 @@ static int bnx2x_prev_mcp_done(struct bnx2x_softc *sc)
uint32_t rc = bnx2x_fw_command(sc, DRV_MSG_CODE_UNLOAD_DONE,
DRV_MSG_CODE_UNLOAD_SKIP_LINK_RESET);
if (!rc) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
return -1;
}
@@ -9507,7 +9507,7 @@ static int bnx2x_prev_unload(struct bnx2x_softc *sc)
/* Lock MCP using an unload request */
fw = bnx2x_fw_command(sc, DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS, 0);
if (!fw) {
- PMD_DRV_LOG(NOTICE, sc, "MCP response failure, aborting");
+ PMD_DRV_LOG(NOTICE, sc, "MCP response failure");
rc = -1;
break;
}
diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c
index 63953c2979ce..3f99be33168b 100644
--- a/drivers/net/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/bnx2x/bnx2x_vfpf.c
@@ -42,7 +42,7 @@ bnx2x_check_bull(struct bnx2x_softc *sc)
++tries;
}
if (tries == BNX2X_VF_BULLETIN_TRIES) {
- PMD_DRV_LOG(ERR, sc, "pf to vf bulletin board crc was wrong %d consecutive times. Aborting",
+ PMD_DRV_LOG(ERR, sc, "pf to vf bulletin board crc was wrong %d consecutive times. Canceling",
tries);
return FALSE;
}
@@ -123,7 +123,7 @@ bnx2x_do_req4pf(struct bnx2x_softc *sc, rte_iova_t phys_addr)
bnx2x_check_bull(sc);
if (sc->old_bulletin.valid_bitmap & (1 << CHANNEL_DOWN)) {
- PMD_DRV_LOG(ERR, sc, "channel is down. Aborting message sending");
+ PMD_DRV_LOG(ERR, sc, "channel is down. Canceling message sending");
return -EINVAL;
}
diff --git a/drivers/net/bnx2x/ecore_hsi.h b/drivers/net/bnx2x/ecore_hsi.h
index eda79408e95a..e33aeb4ea7c1 100644
--- a/drivers/net/bnx2x/ecore_hsi.h
+++ b/drivers/net/bnx2x/ecore_hsi.h
@@ -2693,11 +2693,11 @@ struct shmem2_region {
/* generic flags controlled by the driver */
uint32_t drv_flags; /* 0x00bc */
#define DRV_FLAGS_DCB_CONFIGURED 0x0
- #define DRV_FLAGS_DCB_CONFIGURATION_ABORTED 0x1
+ #define DRV_FLAGS_DCB_CONFIGURATION_CANCELED 0x1
#define DRV_FLAGS_DCB_MFW_CONFIGURED 0x2
#define DRV_FLAGS_PORT_MASK ((1 << DRV_FLAGS_DCB_CONFIGURED) | \
- (1 << DRV_FLAGS_DCB_CONFIGURATION_ABORTED) | \
+ (1 << DRV_FLAGS_DCB_CONFIGURATION_CANCELED) | \
(1 << DRV_FLAGS_DCB_MFW_CONFIGURED))
/* Port offset*/
#define DRV_FLAGS_P0_OFFSET 0
@@ -6368,7 +6368,7 @@ struct ustorm_per_queue_stats {
__le32 coalesced_pkts;
struct regpair coalesced_bytes;
__le32 coalesced_events;
- __le32 coalesced_aborts;
+ __le32 coalesced_cancels;
};
/*
diff --git a/drivers/net/bnx2x/ecore_reg.h b/drivers/net/bnx2x/ecore_reg.h
index 6f7b0522f25c..a6e82d46d753 100644
--- a/drivers/net/bnx2x/ecore_reg.h
+++ b/drivers/net/bnx2x/ecore_reg.h
@@ -2594,7 +2594,7 @@
/* [R 13] Details of first request received with error. [2:0] - PFID. [3] -
* VF_VALID. [9:4] - VFID. [11:10] - Error Code - 0 - Indicates Completion
* Timeout of a User Tx non-posted request. 1 - unsupported request. 2 -
- * completer abort. 3 - Illegal value for this field. [12] valid - indicates
+ * completer cancel. 3 - Illegal value for this field. [12] valid - indicates
* if there was a completion error since the last time this register was
* cleared.
*/
@@ -2602,7 +2602,7 @@
/* [R 18] Details of first ATS Translation Completion request received with
* error. [2:0] - PFID. [3] - VF_VALID. [9:4] - VFID. [11:10] - Error Code -
* 0 - Indicates Completion Timeout of a User Tx non-posted request. 1 -
- * unsupported request. 2 - completer abort. 3 - Illegal value for this
+ * unsupported request. 2 - completer cancel. 3 - Illegal value for this
* field. [16:12] - ATC OTB EntryID. [17] valid - indicates if there was a
* completion error since the last time this register was cleared.
*/
@@ -4786,7 +4786,7 @@
#define PXPCS_TL_CONTROL_5_DL_ERR_ATTN (1 << 22) /*RO*/
#define PXPCS_TL_CONTROL_5_TTX_ERR_NP_TAG_IN_USE (1 << 21) /*WC*/
#define PXPCS_TL_CONTROL_5_TRX_ERR_UNEXP_RTAG (1 << 20) /*WC*/
-#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_ABORT1 (1 << 19) /*WC*/
+#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_CANCEL1 (1 << 19) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_UNSPPORT1 (1 << 18) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_ECRC1 (1 << 17) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_MALF_TLP1 (1 << 16) /*WC*/
@@ -4796,7 +4796,7 @@
#define PXPCS_TL_CONTROL_5_ERR_CPL_TIMEOUT1 (1 << 12) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_FC_PRTL1 (1 << 11) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_PSND_TLP1 (1 << 10) /*WC*/
-#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_ABORT (1 << 9) /*WC*/
+#define PXPCS_TL_CONTROL_5_PRI_SIG_TARGET_CANCEL (1 << 9) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_UNSPPORT (1 << 8) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_ECRC (1 << 7) /*WC*/
#define PXPCS_TL_CONTROL_5_ERR_MALF_TLP (1 << 6) /*WC*/
@@ -4809,7 +4809,7 @@
#define PXPCS_TL_FUNC345_STAT 0x854
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT4 (1 << 29) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL4 (1 << 29) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT4 \
(1 << 28) /* Unsupported Request Error Status in function4, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4840,7 +4840,7 @@
#define PXPCS_TL_FUNC345_STAT_ERR_PSND_TLP4 \
(1 << 20) /* Poisoned Error Status Status in function 4, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT3 (1 << 19) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL3 (1 << 19) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT3 \
(1 << 18) /* Unsupported Request Error Status in function3, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4871,7 +4871,7 @@
#define PXPCS_TL_FUNC345_STAT_ERR_PSND_TLP3 \
(1 << 10) /* Poisoned Error Status Status in function 3, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_ABORT2 (1 << 9) /* WC */
+#define PXPCS_TL_FUNC345_STAT_PRI_SIG_TARGET_CANCEL2 (1 << 9) /* WC */
#define PXPCS_TL_FUNC345_STAT_ERR_UNSPPORT2 \
(1 << 8) /* Unsupported Request Error Status for Function 2, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4905,7 +4905,7 @@
#define PXPCS_TL_FUNC678_STAT 0x85C
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT7 (1 << 29) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL7 (1 << 29) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT7 \
(1 << 28) /* Unsupported Request Error Status in function7, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4936,7 +4936,7 @@
#define PXPCS_TL_FUNC678_STAT_ERR_PSND_TLP7 \
(1 << 20) /* Poisoned Error Status Status in function 7, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT6 (1 << 19) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL6 (1 << 19) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT6 \
(1 << 18) /* Unsupported Request Error Status in function6, if \
set, generate pcie_err_attn output when this error is seen. WC */
@@ -4967,7 +4967,7 @@
#define PXPCS_TL_FUNC678_STAT_ERR_PSND_TLP6 \
(1 << 10) /* Poisoned Error Status Status in function 6, if set, \
generate pcie_err_attn output when this error is seen.. WC */
-#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_ABORT5 (1 << 9) /* WC */
+#define PXPCS_TL_FUNC678_STAT_PRI_SIG_TARGET_CANCEL5 (1 << 9) /* WC */
#define PXPCS_TL_FUNC678_STAT_ERR_UNSPPORT5 \
(1 << 8) /* Unsupported Request Error Status for Function 5, if \
set, generate pcie_err_attn output when this error is seen. WC */
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 10/13] net/mlx5: replace abort with cancel
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (8 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 09/13] net/bnx2x: replace abort with cancel Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 11/13] net/softnic: " Stephen Hemminger
` (3 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Matan Azrad, Viacheslav Ovsiienko, Ori Kam,
Suanming Mou
Replace use of term abort with cancel in mlx5 common and driver code.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/common/mlx5/mlx5_common_mr.c | 6 +++---
drivers/common/mlx5/mlx5_prm.h | 4 ++--
drivers/net/mlx5/hws/mlx5dr_rule.c | 8 ++++----
drivers/net/mlx5/hws/mlx5dr_send.c | 2 +-
drivers/net/mlx5/hws/mlx5dr_send.h | 2 +-
drivers/net/mlx5/linux/mlx5_os.c | 4 ++--
drivers/net/mlx5/mlx5_rx.c | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 40ff9153bd8e..b383ee31683c 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -179,7 +179,7 @@ mr_btree_insert(struct mlx5_mr_btree *bt, struct mr_cache_entry *entry)
/* Find out the slot for insertion. */
if (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) {
DRV_LOG(DEBUG,
- "abort insertion to B-tree(%p): already exist at"
+ "insertion to B-tree(%p): already exist at"
" idx=%u [0x%" PRIxPTR ", 0x%" PRIxPTR ") lkey=0x%x",
(void *)bt, idx, entry->start, entry->end, entry->lkey);
/* Already exist, return. */
@@ -824,7 +824,7 @@ mlx5_mr_create_primary(void *pd,
rte_rwlock_write_lock(&share_cache->rwlock);
/*
* Check the address is really missing. If other thread already created
- * one or it is not found due to overflow, abort and return.
+ * one or it is not found due to overflow, cancel and return.
*/
if (mlx5_mr_lookup_cache(share_cache, entry, addr) != UINT32_MAX) {
/*
@@ -833,7 +833,7 @@ mlx5_mr_create_primary(void *pd,
* here again.
*/
mr_btree_insert(&share_cache->cache, entry);
- DRV_LOG(DEBUG, "Found MR for %p on final lookup, abort",
+ DRV_LOG(DEBUG, "Found MR for %p on final lookup ",
(void *)addr);
rte_rwlock_write_unlock(&share_cache->rwlock);
rte_mcfg_mem_read_unlock();
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 51f426c61408..fa17b8af1846 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -192,7 +192,7 @@
/* Tunnel packet bit in the CQE. */
#define MLX5_CQE_RX_TUNNEL_PACKET (1u << 0)
-/* Mask for LRO push flag in the CQE lro_tcppsh_abort_dupack field. */
+/* Mask for LRO push flag in the CQE lro_tcppsh_dupack field. */
#define MLX5_CQE_LRO_PUSH_MASK 0x40
/* Mask for L4 type in the CQE hdr_type_etc field. */
@@ -423,7 +423,7 @@ struct mlx5_cqe {
uint8_t pkt_info;
uint8_t rsvd0;
uint16_t wqe_id;
- uint8_t lro_tcppsh_abort_dupack;
+ uint8_t lro_tcppsh_dupack;
uint8_t lro_min_ttl;
uint16_t lro_tcp_win;
uint32_t lro_ack_seq_num;
diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c
index 931c68b1606d..70a779a7558b 100644
--- a/drivers/net/mlx5/hws/mlx5dr_rule.c
+++ b/drivers/net/mlx5/hws/mlx5dr_rule.c
@@ -391,7 +391,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
mlx5dr_rule_create_init(rule, &ste_attr, &apply, is_update);
/* Allocate dependent match WQE since rule might have dependent writes.
- * The queued dependent WQE can be later aborted or kept as a dependency.
+ * The queued dependent WQE can be later canceled or kept as a dependency.
* dep_wqe buffers (ctrl, data) are also reused for all STE writes.
*/
dep_wqe = mlx5dr_send_add_new_dep_wqe(queue);
@@ -413,7 +413,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
ret = mlx5dr_rule_alloc_action_ste(rule, attr);
if (ret) {
DR_LOG(ERR, "Failed to allocate action memory %d", ret);
- mlx5dr_send_abort_new_dep_wqe(queue);
+ mlx5dr_send_cancel_new_dep_wqe(queue);
return ret;
}
/* Skip RX/TX based on the dep_wqe init */
@@ -445,8 +445,8 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,
if (action_stes || apply.require_dep)
break;
- /* Rule has no dependencies, abort dep_wqe and send WQE now */
- mlx5dr_send_abort_new_dep_wqe(queue);
+ /* Rule has no dependencies, cancel dep_wqe and send WQE now */
+ mlx5dr_send_cancel_new_dep_wqe(queue);
ste_attr.wqe_tag_is_jumbo = is_jumbo;
ste_attr.send_attr.notify_hw = !attr->burst;
ste_attr.send_attr.user_data = dep_wqe->user_data;
diff --git a/drivers/net/mlx5/hws/mlx5dr_send.c b/drivers/net/mlx5/hws/mlx5dr_send.c
index e58fdeb117f7..7c6ff3f5c75b 100644
--- a/drivers/net/mlx5/hws/mlx5dr_send.c
+++ b/drivers/net/mlx5/hws/mlx5dr_send.c
@@ -15,7 +15,7 @@ mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue)
return &send_sq->dep_wqe[idx];
}
-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue)
+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue)
{
queue->send_ring->send_sq.head_dep_idx--;
}
diff --git a/drivers/net/mlx5/hws/mlx5dr_send.h b/drivers/net/mlx5/hws/mlx5dr_send.h
index c1e8616f7e35..02ecf865ad6a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_send.h
+++ b/drivers/net/mlx5/hws/mlx5dr_send.h
@@ -220,7 +220,7 @@ mlx5dr_uar_write64_relaxed(uint64_t val, void *addr)
struct mlx5dr_send_ring_dep_wqe *
mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue);
-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue);
+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue);
void mlx5dr_send_all_dep_wqe(struct mlx5dr_send_engine *queue);
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index d8f1adfe3df0..26aed417724c 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2384,7 +2384,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
}
if (i != ns) {
DRV_LOG(ERR,
- "probe of PCI device " PCI_PRI_FMT " aborted after"
+ "probe of PCI device " PCI_PRI_FMT " canceled after"
" encountering an error: %s",
owner_pci.domain, owner_pci.bus,
owner_pci.devid, owner_pci.function,
@@ -2484,7 +2484,7 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev,
eth_da.ports[p], mkvlist);
if (ret) {
DRV_LOG(INFO, "Probe of PCI device " PCI_PRI_FMT " "
- "aborted due to proding failure of PF %u",
+ "canceled due to proding failure of PF %u",
pci_dev->addr.domain, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function,
eth_da.ports[p]);
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index 392784050f57..7505bc888a4f 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1085,7 +1085,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
tcp->recv_ack = cqe->lro_ack_seq_num;
tcp->rx_win = cqe->lro_tcp_win;
}
- if (cqe->lro_tcppsh_abort_dupack & MLX5_CQE_LRO_PUSH_MASK)
+ if (cqe->lro_tcppsh_dupack & MLX5_CQE_LRO_PUSH_MASK)
tcp->tcp_flags |= RTE_TCP_PSH_FLAG;
tcp->cksum = 0;
csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4);
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 11/13] net/softnic: replace abort with cancel
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (9 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 10/13] net/mlx5: " Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 12/13] net/mlx4: remove word abort Stephen Hemminger
` (2 subsequent siblings)
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Cristian Dumitrescu
The term abort is o the Tier 1 non-inclusive word list.
Replace it with cancel. This also impacts the CLI
for controlling this driver.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/softnic/rte_eth_softnic_cli.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c
index 085523fe0310..bdb89753696a 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1389,14 +1389,14 @@ cmd_softnic_pipeline_commit(struct pmd_internals *softnic,
status = rte_swx_ctl_pipeline_commit(p->ctl, 1);
if (status)
snprintf(out, out_size, "Commit failed. "
- "Use \"commit\" to retry or \"abort\" to discard the pending work.\n");
+ "Use \"commit\" to retry or \"cancel\" to discard the pending work.\n");
}
/**
- * pipeline <pipeline_name> abort
+ * pipeline <pipeline_name> cancel
*/
static void
-cmd_softnic_pipeline_abort(struct pmd_internals *softnic,
+cmd_softnic_pipeline_cancel(struct pmd_internals *softnic,
char **tokens,
uint32_t n_tokens,
char *out,
@@ -1417,7 +1417,7 @@ cmd_softnic_pipeline_abort(struct pmd_internals *softnic,
return;
}
- rte_swx_ctl_pipeline_abort(p->ctl);
+ rte_swx_ctl_pipeline_cancel(p->ctl);
}
/**
@@ -2428,8 +2428,8 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
return;
}
- if (n_tokens >= 3 && !strcmp(tokens[2], "abort")) {
- cmd_softnic_pipeline_abort(softnic, tokens, n_tokens, out, out_size);
+ if (n_tokens >= 3 && !strcmp(tokens[2], "cancel")) {
+ cmd_softnic_pipeline_cancel(softnic, tokens, n_tokens, out, out_size);
return;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 12/13] net/mlx4: remove word abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (10 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 11/13] net/softnic: " Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 13/13] net/axgbe: replace " Stephen Hemminger
2023-08-30 16:49 ` [PATCH v2 00/13] Replace us of term abort Thomas Monjalon
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Matan Azrad, Viacheslav Ovsiienko
Avoid using the term abort since it is on Tier 1 word list.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/mlx4/mlx4_mr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index e95f45aa3e95..1bd47e05caeb 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -161,7 +161,7 @@ mr_btree_insert(struct mlx4_mr_btree *bt, struct mlx4_mr_cache *entry)
lkp_tbl = *bt->table;
/* Find out the slot for insertion. */
if (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) {
- DEBUG("abort insertion to B-tree(%p): already exist at"
+ DEBUG("insertion to B-tree(%p): already exist at"
" idx=%u [0x%" PRIxPTR ", 0x%" PRIxPTR ") lkey=0x%x",
(void *)bt, idx, entry->start, entry->end, entry->lkey);
/* Already exist, return. */
@@ -720,7 +720,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
rte_rwlock_write_lock(&priv->mr.rwlock);
/*
* Check the address is really missing. If other thread already created
- * one or it is not found due to overflow, abort and return.
+ * one or it is not found due to overflow, cancel and return.
*/
if (mr_lookup_dev(dev, entry, addr) != UINT32_MAX) {
/*
@@ -729,7 +729,7 @@ mlx4_mr_create_primary(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,
* here again.
*/
mr_btree_insert(&priv->mr.cache, entry);
- DEBUG("port %u found MR for %p on final lookup, abort",
+ DEBUG("port %u found MR for %p on final lookup",
dev->data->port_id, (void *)addr);
rte_rwlock_write_unlock(&priv->mr.rwlock);
rte_mcfg_mem_read_unlock();
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2 13/13] net/axgbe: replace word abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (11 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 12/13] net/mlx4: remove word abort Stephen Hemminger
@ 2023-08-18 17:45 ` Stephen Hemminger
2023-08-30 16:49 ` [PATCH v2 00/13] Replace us of term abort Thomas Monjalon
13 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-08-18 17:45 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Chandubabu Namburu
Use cancel instead of abort.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/axgbe/axgbe_common.h | 4 ++--
drivers/net/axgbe/axgbe_ethdev.h | 2 +-
drivers/net/axgbe/axgbe_i2c.c | 26 +++++++++++++-------------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h
index a5d11c583210..9180848f525c 100644
--- a/drivers/net/axgbe/axgbe_common.h
+++ b/drivers/net/axgbe/axgbe_common.h
@@ -1123,8 +1123,8 @@
#define IC_DATA_CMD_CMD_WIDTH 1
#define IC_DATA_CMD_STOP_INDEX 9
#define IC_DATA_CMD_STOP_WIDTH 1
-#define IC_ENABLE_ABORT_INDEX 1
-#define IC_ENABLE_ABORT_WIDTH 1
+#define IC_ENABLE_CANCEL_INDEX 1
+#define IC_ENABLE_CANCEL_WIDTH 1
#define IC_ENABLE_EN_INDEX 0
#define IC_ENABLE_EN_WIDTH 1
#define IC_ENABLE_STATUS_EN_INDEX 0
diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index 7f19321d881b..513b083c3b8b 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -271,7 +271,7 @@ struct axgbe_i2c_op_state {
unsigned int rx_len;
unsigned char *rx_buf;
- unsigned int tx_abort_source;
+ unsigned int tx_cancel_source;
int ret;
};
diff --git a/drivers/net/axgbe/axgbe_i2c.c b/drivers/net/axgbe/axgbe_i2c.c
index a2798f484e72..917867f60b27 100644
--- a/drivers/net/axgbe/axgbe_i2c.c
+++ b/drivers/net/axgbe/axgbe_i2c.c
@@ -6,7 +6,7 @@
#include "axgbe_ethdev.h"
#include "axgbe_common.h"
-#define AXGBE_ABORT_COUNT 500
+#define AXGBE_CANCEL_COUNT 500
#define AXGBE_DISABLE_COUNT 1000
#define AXGBE_STD_SPEED 1
@@ -23,18 +23,18 @@
#define AXGBE_I2C_READ BIT(8)
#define AXGBE_I2C_STOP BIT(9)
-static int axgbe_i2c_abort(struct axgbe_port *pdata)
+static int axgbe_i2c_cancel(struct axgbe_port *pdata)
{
- unsigned int wait = AXGBE_ABORT_COUNT;
+ unsigned int wait = AXGBE_CANCEL_COUNT;
- /* Must be enabled to recognize the abort request */
+ /* Must be enabled to recognize the cancel request */
XI2C_IOWRITE_BITS(pdata, IC_ENABLE, EN, 1);
- /* Issue the abort */
- XI2C_IOWRITE_BITS(pdata, IC_ENABLE, ABORT, 1);
+ /* Issue the cancel */
+ XI2C_IOWRITE_BITS(pdata, IC_ENABLE, CANCEL, 1);
while (wait--) {
- if (!XI2C_IOREAD_BITS(pdata, IC_ENABLE, ABORT))
+ if (!XI2C_IOREAD_BITS(pdata, IC_ENABLE, CANCEL))
return 0;
rte_delay_us(500);
}
@@ -64,8 +64,8 @@ static int axgbe_i2c_disable(struct axgbe_port *pdata)
ret = axgbe_i2c_set_enable(pdata, false);
if (ret) {
- /* Disable failed, try an abort */
- ret = axgbe_i2c_abort(pdata);
+ /* Disable failed, try an cancel */
+ ret = axgbe_i2c_cancel(pdata);
if (ret)
return ret;
@@ -147,7 +147,7 @@ static void axgbe_i2c_clear_isr_interrupts(struct axgbe_port *pdata,
struct axgbe_i2c_op_state *state = &pdata->i2c.op_state;
if (isr & AXGBE_INTR_TX_ABRT) {
- state->tx_abort_source = XI2C_IOREAD(pdata, IC_TX_ABRT_SOURCE);
+ state->tx_cancel_source = XI2C_IOREAD(pdata, IC_TX_ABRT_SOURCE);
XI2C_IOREAD(pdata, IC_CLR_TX_ABRT);
}
@@ -169,7 +169,7 @@ static int axgbe_i2c_isr(struct axgbe_port *pdata)
if (isr & AXGBE_INTR_TX_ABRT) {
PMD_DRV_LOG(DEBUG,
"I2C TX_ABRT received (%#010x) for target %#04x\n",
- state->tx_abort_source, state->op->target);
+ state->tx_cancel_source, state->op->target);
axgbe_i2c_disable_interrupts(pdata);
@@ -277,9 +277,9 @@ static int axgbe_i2c_xfer(struct axgbe_port *pdata, struct axgbe_i2c_op *op)
success:
ret = state->ret;
if (ret) {
- if (state->tx_abort_source & IC_TX_ABRT_7B_ADDR_NOACK)
+ if (state->tx_cancel_source & IC_TX_ABRT_7B_ADDR_NOACK)
ret = -ENOTCONN;
- else if (state->tx_abort_source & IC_TX_ABRT_ARB_LOST)
+ else if (state->tx_cancel_source & IC_TX_ABRT_ARB_LOST)
ret = -EAGAIN;
}
--
2.39.2
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 00/13] Replace us of term abort
2023-08-18 17:45 ` [PATCH v2 00/13] Replace us of term abort Stephen Hemminger
` (12 preceding siblings ...)
2023-08-18 17:45 ` [PATCH v2 13/13] net/axgbe: replace " Stephen Hemminger
@ 2023-08-30 16:49 ` Thomas Monjalon
2023-09-06 19:39 ` Stephen Hemminger
13 siblings, 1 reply; 37+ messages in thread
From: Thomas Monjalon @ 2023-08-30 16:49 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
18/08/2023 19:45, Stephen Hemminger:
> The term 'abort' is on the inclusive namin Tier 1 word list
> as replace when possible. It is possible to do this across
> DPDK except the few places that directly call the lib C abort()
> function.
>
> v2 - drop changes to sfc since requires changes to base driver
> - cleanup some checkpatch and missing spots
>
> Rationale (from https://inclusivenaming.org/word-lists/tier-1/abort/)
>
> The term “abort” frequently appeared in Inclusive Language
> Initiative surveys and standards reviews. Multiple organizations felt
> that usage of the word posed an issue worth addressing in their
> individual companies and projects. Given this widespread interest, the
> INI has decided to offer its own guidance.
>
> INI recommends replacing “abort” wherever possible. In accordance with
> the INI’s language framework, the term does not necessarily constitute
> a first-order concern. However, because it is such a charged term
> outside of computing, “abort” fails to provide a clear description of
> the action being taken, and serves primarily to distract. There are
> numerous other words in the English language that can serve the same
> purpose in computing without invoking the emotionally charged cultural
> context of “abort.”
>
> Although the INI debated whether the word “abort” itself or the
> procedure commonly associated with it (“abortion”) caused the
> aforementioned distractions, the etymology of the word has a direct
> and unambiguous link to the termination of a pregnancy. Alternative
> uses of the word “abort” are in use today, such as in
> rocketry. However, the INI concluded that the term itself was
> insufficiently distanced from its original meaning for those
> alternative definitions to be its primary association.
>
> All this being said, the INI does not advocate for a blanket
> replacement of the term. “Abort” appears in many standards
> organization documents, and is deeply embedded in some operating
> systems. As such, the INI acknowledges that the term may need to
> be retained in certain contexts to remain in compliance with those
> standards, or to preserve accurate documentation for bedrock
> functions and processes that are too fundamental to be changed.
>
> Some organizations have noted that using “abort” in contexts other
> than the medical or political serves to de-stigmatize the term,
> thereby promoting reproductive rights and bodily autonomy. Conversely,
> discouraging the term could be interpreted as accepting a framing that
> denies a pregnant person’s right to control their body. The judgment
> of the INI is that the term causes discomfort or offense without
> providing a necessary degree of technical clarity, and therefore it
> should be avoided. At some future point, because language changes over
> time, “abort” may become a less contentious term; at that juncture,
> the appropriateness of the term may be revisited.
I don't feel the rationale should be followed here.
If there are better terms, why not.
But really, "abort" is not only medical.
And banning this word may be felt as a political position,
which is not what we want.
I am OK to replace if there is a better word in some contexts,
but we should not make it forbidden.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH v2 00/13] Replace us of term abort
2023-08-30 16:49 ` [PATCH v2 00/13] Replace us of term abort Thomas Monjalon
@ 2023-09-06 19:39 ` Stephen Hemminger
2023-09-06 21:19 ` Thomas Monjalon
0 siblings, 1 reply; 37+ messages in thread
From: Stephen Hemminger @ 2023-09-06 19:39 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev
On Wed, 30 Aug 2023 18:49:14 +0200
Thomas Monjalon <thomas@monjalon.net> wrote:
> I don't feel the rationale should be followed here.
> If there are better terms, why not.
> But really, "abort" is not only medical.
> And banning this word may be felt as a political position,
> which is not what we want.
>
> I am OK to replace if there is a better word in some contexts,
> but we should not make it forbidden.
There are two overlapping reasons behind this.
First, any reference to abortion in the US is a political hot button.
Therefore the recommendation is to avoid the term.
The other reason is that the term may raise some negative feelings
from people that have had to have an abortion.
According to the etymology sites and dictionary sites
I looked at the term comes from a strictly medical point of view:
https://www.etymonline.com/word/abortion
https://www.merriam-webster.com/dictionary/abort
It looks like the secondary meaning in computer science came later.
It would be best if the term could be avoid if possible.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v2 00/13] Replace us of term abort
2023-09-06 19:39 ` Stephen Hemminger
@ 2023-09-06 21:19 ` Thomas Monjalon
2023-09-06 23:03 ` Stephen Hemminger
0 siblings, 1 reply; 37+ messages in thread
From: Thomas Monjalon @ 2023-09-06 21:19 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
06/09/2023 21:39, Stephen Hemminger:
> On Wed, 30 Aug 2023 18:49:14 +0200
> Thomas Monjalon <thomas@monjalon.net> wrote:
>
> > I don't feel the rationale should be followed here.
> > If there are better terms, why not.
> > But really, "abort" is not only medical.
> > And banning this word may be felt as a political position,
> > which is not what we want.
> >
> > I am OK to replace if there is a better word in some contexts,
> > but we should not make it forbidden.
>
> There are two overlapping reasons behind this.
> First, any reference to abortion in the US is a political hot button.
Sorry that you live in such a country ;)
> Therefore the recommendation is to avoid the term.
>
> The other reason is that the term may raise some negative feelings
> from people that have had to have an abortion.
Forbidding the word may be understood as the opposite reason.
That's why I think we should not forbid the word officially.
> According to the etymology sites and dictionary sites
> I looked at the term comes from a strictly medical point of view:
> https://www.etymonline.com/word/abortion
> https://www.merriam-webster.com/dictionary/abort
> It looks like the secondary meaning in computer science came later.
> It would be best if the term could be avoid if possible.
If there are better alternatives, let's use them for the only reason
they are better understood in their respective context.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v2 00/13] Replace us of term abort
2023-09-06 21:19 ` Thomas Monjalon
@ 2023-09-06 23:03 ` Stephen Hemminger
0 siblings, 0 replies; 37+ messages in thread
From: Stephen Hemminger @ 2023-09-06 23:03 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev
On Wed, 06 Sep 2023 23:19:23 +0200
Thomas Monjalon <thomas@monjalon.net> wrote:
> 06/09/2023 21:39, Stephen Hemminger:
> > On Wed, 30 Aug 2023 18:49:14 +0200
> > Thomas Monjalon <thomas@monjalon.net> wrote:
> >
> > > I don't feel the rationale should be followed here.
> > > If there are better terms, why not.
> > > But really, "abort" is not only medical.
> > > And banning this word may be felt as a political position,
> > > which is not what we want.
> > >
> > > I am OK to replace if there is a better word in some contexts,
> > > but we should not make it forbidden.
> >
> > There are two overlapping reasons behind this.
> > First, any reference to abortion in the US is a political hot button.
>
> Sorry that you live in such a country ;)
>
> > Therefore the recommendation is to avoid the term.
> >
> > The other reason is that the term may raise some negative feelings
> > from people that have had to have an abortion.
>
> Forbidding the word may be understood as the opposite reason.
> That's why I think we should not forbid the word officially.
With word choices, it is important to get an answer from the person most
likely to be impacted. I.e what would a politically active female in US
have to say. Let me ask around to see if it matters.
^ permalink raw reply [flat|nested] 37+ messages in thread