From patchwork Fri Aug 18 02:52:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130494 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3DE641B5F; Fri, 18 Aug 2023 04:54:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AB5243286; Fri, 18 Aug 2023 04:53:15 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id D610243276 for ; Fri, 18 Aug 2023 04:53:10 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26b4a9205e3so319897a91.0 for ; Thu, 17 Aug 2023 19:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=; b=ox2/jIGG8AqJ9ueTfPhLiAJV+Bk6YvYlAyM0SUShmOvWAfYdyI6zgXRYUKwgqskHA5 FAMp7yco1XOP1ErPW6hbJ2QJt2g1hBvziPRVSN/1w2bxzFcgXbZTV7jTZRRTQoH+BitI 8kEQitid9Dcgifg7iP/ryYyH0XF6dmGWce9pKyK8TTjZPvYKFQv5BQ9kPg2ynfGcOY2W rDar6a6Hk7w13lPFoIlFWtVJ32qPVC8GwApxdXyk0QeVdwKJGfJxrF8/jblDLR0xTLIT viSkSY2cw5tCsOGkdegj95057u/jqiO+SFInAA0l0t6trL3YvRH26hb2uxI+OmsyfIiq Mn9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=; b=LZeAxHQ2x+xQZ1soE+9aSIzIpESe+9NJFr0szsU3X5U6SnbzPqLgL1tIWvSeub7+jN ZS9fQEvlLCkg37L513u/nnFUqeoY7jhSI+csWPUaTpBAYvIyc8rPpNSZzzAtg3OAa/1e TKiTyEIm+hvx4xOS0Isuf5At0C5sWiNtoLP0B4aW3QqLcadeE8vWUjqlZDxnnY2fXs2j aFlgp2aZBXym3gOH/MVus+KR1o9GNIQ7swBRxb2yUDV2aUL38EvsluF/772iL27tDxh6 Sh/B6+nXGZVOeGCoAKb6hWc+4Ljc+luCsGY+6U26CgOxp0z+OyxiY6QAG0d+oO1O+LQ5 Httg== X-Gm-Message-State: AOJu0YyD3Mq1iqehM3vVr491RwZ12gJ7Xr28HaMI3ykRX2A7cSpMD5hF X8pMcUjWZjNoExra2QcpNxlGXpKJp5WSyIrUXxF3sg== X-Google-Smtp-Source: AGHT+IGRypLR6cEZdh9GjvCo5JDTVB2OMpyJzXO+fw3KG33D0GONYg7CxsFPJ1gAAAm1Vfw8AcHN7A== X-Received: by 2002:a17:90a:1b41:b0:26b:7354:f009 with SMTP id q59-20020a17090a1b4100b0026b7354f009mr1199222pjq.43.1692327189276; Thu, 17 Aug 2023 19:53:09 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH 10/14] net/mlx5: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:45 -0700 Message-Id: <20230818025249.33994-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace use of term abort with cancel in mlx5 common and driver code. Signed-off-by: Stephen Hemminger --- 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);