From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Subject: [PATCH 13/14] sfc: remove use of term abort
Date: Thu, 17 Aug 2023 19:52:48 -0700 [thread overview]
Message-ID: <20230818025249.33994-14-stephen@networkplumber.org> (raw)
In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org>
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
next prev parent reply other threads:[~2023-08-18 2:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 2:52 [PATCH 00/14] " Stephen Hemminger
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
2023-08-18 2:52 ` [PATCH 02/14] all: remove use of word abort 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
2023-08-18 2:52 ` [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
2023-08-18 2:52 ` [PATCH 05/14] event/dlb2: remove word abort in comments Stephen Hemminger
2023-08-18 2:52 ` [PATCH 06/14] net/vdev_netvsc: replace use of term abort Stephen Hemminger
2023-08-18 2:52 ` [PATCH 07/14] net/netvsc: replace abort with cancel Stephen Hemminger
2023-08-18 2:52 ` [PATCH 08/14] net/ionic: remove word aborting Stephen Hemminger
2023-08-18 2:52 ` [PATCH 09/14] net/bnx2x: replace abort with cancel Stephen Hemminger
2023-08-18 2:52 ` [PATCH 10/14] net/mlx5: " Stephen Hemminger
2023-08-18 2:52 ` [PATCH 11/14] net/softnic: " Stephen Hemminger
2023-08-18 2:52 ` [PATCH 12/14] net/mlx4: remove word abort Stephen Hemminger
2023-08-18 2:52 ` Stephen Hemminger [this message]
2023-08-18 2:52 ` [PATCH 14/14] net/axgbe: replace " Stephen Hemminger
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 ` [PATCH v2 03/13] pipeline: remove use of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic() Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 05/13] event/dlb2: remove word abort in comments Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 07/13] net/netvsc: replace abort with cancel 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
2023-08-18 17:45 ` [PATCH v2 09/13] net/bnx2x: replace abort with cancel Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 10/13] net/mlx5: " Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 11/13] net/softnic: " Stephen Hemminger
2023-08-18 17:45 ` [PATCH v2 12/13] net/mlx4: remove word abort 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
2023-09-06 19:39 ` Stephen Hemminger
2023-09-06 21:19 ` Thomas Monjalon
2023-09-06 23:03 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230818025249.33994-14-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).