From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Matan Azrad <matan@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Subject: [PATCH v2 12/13] net/mlx4: remove word abort
Date: Fri, 18 Aug 2023 10:45:36 -0700 [thread overview]
Message-ID: <20230818174537.290222-13-stephen@networkplumber.org> (raw)
In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org>
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
next prev parent reply other threads:[~2023-08-18 17:48 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
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 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 ` [PATCH 13/14] sfc: remove use of term abort 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
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 ` Stephen Hemminger [this message]
2023-08-18 17:45 ` [PATCH v2 13/13] net/axgbe: replace word abort 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=20230818174537.290222-13-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=matan@nvidia.com \
--cc=viacheslavo@nvidia.com \
/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).