Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130494/?format=api
{ "id": 130494, "url": "http://patches.dpdk.org/api/patches/130494/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230818025249.33994-11-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230818025249.33994-11-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230818025249.33994-11-stephen@networkplumber.org", "date": "2023-08-18T02:52:45", "name": "[10/14] net/mlx5: replace abort with cancel", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "80360fb5d7aa16a1372cf01f9be7ac122549837b", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230818025249.33994-11-stephen@networkplumber.org/mbox/", "series": [ { "id": 29271, "url": "http://patches.dpdk.org/api/series/29271/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29271", "date": "2023-08-18T02:52:35", "name": "remove use of term abort", "version": 1, "mbox": "http://patches.dpdk.org/series/29271/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/130494/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/130494/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E3DE641B5F;\n\tFri, 18 Aug 2023 04:54:02 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8AB5243286;\n\tFri, 18 Aug 2023 04:53:15 +0200 (CEST)", "from mail-pj1-f44.google.com (mail-pj1-f44.google.com\n [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id D610243276\n for <dev@dpdk.org>; Fri, 18 Aug 2023 04:53:10 +0200 (CEST)", "by mail-pj1-f44.google.com with SMTP id\n 98e67ed59e1d1-26b4a9205e3so319897a91.0\n for <dev@dpdk.org>; Thu, 17 Aug 2023 19:53:10 -0700 (PDT)", "from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207])\n by smtp.gmail.com with ESMTPSA id\n ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.08\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 17 Aug 2023 19:53:08 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327190;\n x=1692931990;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=;\n b=ox2/jIGG8AqJ9ueTfPhLiAJV+Bk6YvYlAyM0SUShmOvWAfYdyI6zgXRYUKwgqskHA5\n FAMp7yco1XOP1ErPW6hbJ2QJt2g1hBvziPRVSN/1w2bxzFcgXbZTV7jTZRRTQoH+BitI\n 8kEQitid9Dcgifg7iP/ryYyH0XF6dmGWce9pKyK8TTjZPvYKFQv5BQ9kPg2ynfGcOY2W\n rDar6a6Hk7w13lPFoIlFWtVJ32qPVC8GwApxdXyk0QeVdwKJGfJxrF8/jblDLR0xTLIT\n viSkSY2cw5tCsOGkdegj95057u/jqiO+SFInAA0l0t6trL3YvRH26hb2uxI+OmsyfIiq\n Mn9w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1692327190; x=1692931990;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=;\n b=LZeAxHQ2x+xQZ1soE+9aSIzIpESe+9NJFr0szsU3X5U6SnbzPqLgL1tIWvSeub7+jN\n ZS9fQEvlLCkg37L513u/nnFUqeoY7jhSI+csWPUaTpBAYvIyc8rPpNSZzzAtg3OAa/1e\n TKiTyEIm+hvx4xOS0Isuf5At0C5sWiNtoLP0B4aW3QqLcadeE8vWUjqlZDxnnY2fXs2j\n aFlgp2aZBXym3gOH/MVus+KR1o9GNIQ7swBRxb2yUDV2aUL38EvsluF/772iL27tDxh6\n Sh/B6+nXGZVOeGCoAKb6hWc+4Ljc+luCsGY+6U26CgOxp0z+OyxiY6QAG0d+oO1O+LQ5\n Httg==", "X-Gm-Message-State": "AOJu0YyD3Mq1iqehM3vVr491RwZ12gJ7Xr28HaMI3ykRX2A7cSpMD5hF\n X8pMcUjWZjNoExra2QcpNxlGXpKJp5WSyIrUXxF3sg==", "X-Google-Smtp-Source": "\n AGHT+IGRypLR6cEZdh9GjvCo5JDTVB2OMpyJzXO+fw3KG33D0GONYg7CxsFPJ1gAAAm1Vfw8AcHN7A==", "X-Received": "by 2002:a17:90a:1b41:b0:26b:7354:f009 with SMTP id\n q59-20020a17090a1b4100b0026b7354f009mr1199222pjq.43.1692327189276;\n Thu, 17 Aug 2023 19:53:09 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Matan Azrad <matan@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>,\n Suanming Mou <suanmingm@nvidia.com>", "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", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Replace use of term abort with cancel in mlx5 common and driver code.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/common/mlx5/mlx5_common_mr.c | 6 +++---\n drivers/common/mlx5/mlx5_prm.h | 4 ++--\n drivers/net/mlx5/hws/mlx5dr_rule.c | 8 ++++----\n drivers/net/mlx5/hws/mlx5dr_send.c | 2 +-\n drivers/net/mlx5/hws/mlx5dr_send.h | 2 +-\n drivers/net/mlx5/linux/mlx5_os.c | 4 ++--\n drivers/net/mlx5/mlx5_rx.c | 2 +-\n 7 files changed, 14 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c\nindex 40ff9153bd8e..b383ee31683c 100644\n--- a/drivers/common/mlx5/mlx5_common_mr.c\n+++ b/drivers/common/mlx5/mlx5_common_mr.c\n@@ -179,7 +179,7 @@ mr_btree_insert(struct mlx5_mr_btree *bt, struct mr_cache_entry *entry)\n \t/* Find out the slot for insertion. */\n \tif (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) {\n \t\tDRV_LOG(DEBUG,\n-\t\t\t\"abort insertion to B-tree(%p): already exist at\"\n+\t\t\t\"insertion to B-tree(%p): already exist at\"\n \t\t\t\" idx=%u [0x%\" PRIxPTR \", 0x%\" PRIxPTR \") lkey=0x%x\",\n \t\t\t(void *)bt, idx, entry->start, entry->end, entry->lkey);\n \t\t/* Already exist, return. */\n@@ -824,7 +824,7 @@ mlx5_mr_create_primary(void *pd,\n \trte_rwlock_write_lock(&share_cache->rwlock);\n \t/*\n \t * Check the address is really missing. If other thread already created\n-\t * one or it is not found due to overflow, abort and return.\n+\t * one or it is not found due to overflow, cancel and return.\n \t */\n \tif (mlx5_mr_lookup_cache(share_cache, entry, addr) != UINT32_MAX) {\n \t\t/*\n@@ -833,7 +833,7 @@ mlx5_mr_create_primary(void *pd,\n \t\t * here again.\n \t\t */\n \t\tmr_btree_insert(&share_cache->cache, entry);\n-\t\tDRV_LOG(DEBUG, \"Found MR for %p on final lookup, abort\",\n+\t\tDRV_LOG(DEBUG, \"Found MR for %p on final lookup \",\n \t\t\t(void *)addr);\n \t\trte_rwlock_write_unlock(&share_cache->rwlock);\n \t\trte_mcfg_mem_read_unlock();\ndiff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h\nindex 51f426c61408..fa17b8af1846 100644\n--- a/drivers/common/mlx5/mlx5_prm.h\n+++ b/drivers/common/mlx5/mlx5_prm.h\n@@ -192,7 +192,7 @@\n /* Tunnel packet bit in the CQE. */\n #define MLX5_CQE_RX_TUNNEL_PACKET (1u << 0)\n \n-/* Mask for LRO push flag in the CQE lro_tcppsh_abort_dupack field. */\n+/* Mask for LRO push flag in the CQE lro_tcppsh_dupack field. */\n #define MLX5_CQE_LRO_PUSH_MASK 0x40\n \n /* Mask for L4 type in the CQE hdr_type_etc field. */\n@@ -423,7 +423,7 @@ struct mlx5_cqe {\n \tuint8_t pkt_info;\n \tuint8_t rsvd0;\n \tuint16_t wqe_id;\n-\tuint8_t lro_tcppsh_abort_dupack;\n+\tuint8_t lro_tcppsh_dupack;\n \tuint8_t lro_min_ttl;\n \tuint16_t lro_tcp_win;\n \tuint32_t lro_ack_seq_num;\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c\nindex 931c68b1606d..70a779a7558b 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_rule.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_rule.c\n@@ -391,7 +391,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,\n \tmlx5dr_rule_create_init(rule, &ste_attr, &apply, is_update);\n \n \t/* Allocate dependent match WQE since rule might have dependent writes.\n-\t * The queued dependent WQE can be later aborted or kept as a dependency.\n+\t * The queued dependent WQE can be later canceled or kept as a dependency.\n \t * dep_wqe buffers (ctrl, data) are also reused for all STE writes.\n \t */\n \tdep_wqe = mlx5dr_send_add_new_dep_wqe(queue);\n@@ -413,7 +413,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,\n \t\tret = mlx5dr_rule_alloc_action_ste(rule, attr);\n \t\tif (ret) {\n \t\t\tDR_LOG(ERR, \"Failed to allocate action memory %d\", ret);\n-\t\t\tmlx5dr_send_abort_new_dep_wqe(queue);\n+\t\t\tmlx5dr_send_cancel_new_dep_wqe(queue);\n \t\t\treturn ret;\n \t\t}\n \t\t/* Skip RX/TX based on the dep_wqe init */\n@@ -445,8 +445,8 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule,\n \t\t\tif (action_stes || apply.require_dep)\n \t\t\t\tbreak;\n \n-\t\t\t/* Rule has no dependencies, abort dep_wqe and send WQE now */\n-\t\t\tmlx5dr_send_abort_new_dep_wqe(queue);\n+\t\t\t/* Rule has no dependencies, cancel dep_wqe and send WQE now */\n+\t\t\tmlx5dr_send_cancel_new_dep_wqe(queue);\n \t\t\tste_attr.wqe_tag_is_jumbo = is_jumbo;\n \t\t\tste_attr.send_attr.notify_hw = !attr->burst;\n \t\t\tste_attr.send_attr.user_data = dep_wqe->user_data;\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_send.c b/drivers/net/mlx5/hws/mlx5dr_send.c\nindex e58fdeb117f7..7c6ff3f5c75b 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_send.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_send.c\n@@ -15,7 +15,7 @@ mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue)\n \treturn &send_sq->dep_wqe[idx];\n }\n \n-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue)\n+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue)\n {\n \tqueue->send_ring->send_sq.head_dep_idx--;\n }\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_send.h b/drivers/net/mlx5/hws/mlx5dr_send.h\nindex c1e8616f7e35..02ecf865ad6a 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_send.h\n+++ b/drivers/net/mlx5/hws/mlx5dr_send.h\n@@ -220,7 +220,7 @@ mlx5dr_uar_write64_relaxed(uint64_t val, void *addr)\n struct mlx5dr_send_ring_dep_wqe *\n mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue);\n \n-void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue);\n+void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue);\n \n void mlx5dr_send_all_dep_wqe(struct mlx5dr_send_engine *queue);\n \ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex d8f1adfe3df0..26aed417724c 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -2384,7 +2384,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,\n \t}\n \tif (i != ns) {\n \t\tDRV_LOG(ERR,\n-\t\t\t\"probe of PCI device \" PCI_PRI_FMT \" aborted after\"\n+\t\t\t\"probe of PCI device \" PCI_PRI_FMT \" canceled after\"\n \t\t\t\" encountering an error: %s\",\n \t\t\towner_pci.domain, owner_pci.bus,\n \t\t\towner_pci.devid, owner_pci.function,\n@@ -2484,7 +2484,7 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev,\n \t\t\t\t\t\t eth_da.ports[p], mkvlist);\n \t\t\tif (ret) {\n \t\t\t\tDRV_LOG(INFO, \"Probe of PCI device \" PCI_PRI_FMT \" \"\n-\t\t\t\t\t\"aborted due to proding failure of PF %u\",\n+\t\t\t\t\t\"canceled due to proding failure of PF %u\",\n \t\t\t\t\tpci_dev->addr.domain, pci_dev->addr.bus,\n \t\t\t\t\tpci_dev->addr.devid, pci_dev->addr.function,\n \t\t\t\t\teth_da.ports[p]);\ndiff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c\nindex 392784050f57..ceafa95555de 100644\n--- a/drivers/net/mlx5/mlx5_rx.c\n+++ b/drivers/net/mlx5/mlx5_rx.c\n@@ -1085,7 +1085,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,\n \t\ttcp->recv_ack = cqe->lro_ack_seq_num;\n \t\ttcp->rx_win = cqe->lro_tcp_win;\n \t}\n-\tif (cqe->lro_tcppsh_abort_dupack & MLX5_CQE_LRO_PUSH_MASK)\n+\tif (cqe->lro_tcppsh_cancel_dupack & MLX5_CQE_LRO_PUSH_MASK)\n \t\ttcp->tcp_flags |= RTE_TCP_PSH_FLAG;\n \ttcp->cksum = 0;\n \tcsum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4);\n", "prefixes": [ "10/14" ] }