From patchwork Fri Aug 18 17:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130526 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 5B0D34309A; Fri, 18 Aug 2023 19:46:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC28542FB2; Fri, 18 Aug 2023 19:46:47 +0200 (CEST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mails.dpdk.org (Postfix) with ESMTP id 765C140395 for ; Fri, 18 Aug 2023 19:46:45 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6889350bc2bso1106341b3a.0 for ; Fri, 18 Aug 2023 10:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380804; x=1692985604; 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=E1MtmzRczG9R8sdimGR3cF3ENkpHmb30hP1omR7gfKE=; b=iUv50qfl8/mjKH1QQ3BhkkpH6/OpyLxFrO8QT3Qtm5HTEInQD2beCoKCOPC38rvycH BOeH8/25COLmnjnMH80F75Swi6+qAlL+nEobJksi2JeGR/5eeoGIWJZIGs6NyvmxJtZ7 JKZt74dct1w8dfZz+IOKClcGNLP4AYUv5OuzQw71Tc56WlSJWUBtjayCs27GyyJs5Xps K9zN/kKFAj8zpEhX1P9mUG8MD16XGXjZwM0ieFM8PPU+cSI2g4Om9v/fjOj24o/n4axd TorrLZcJsNfzRwFK/RHmtAw52YRrk6NvqQjB7eOhIOYXqYZ14DT8qNhowHDizQiJUxqe 4jdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380804; x=1692985604; 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=E1MtmzRczG9R8sdimGR3cF3ENkpHmb30hP1omR7gfKE=; b=bbvFTUU9MUlGqAMes7abfqelGlxnK6D2IRgI7t3FF9GCiNHGUxA392Vo06YoL/tntR 60l2eIqvlpIEwHdPtkcuD/h7UvDwsViY4FMhWSw5NPbiHExKO5iuoaQZ0bQXT7YqvpzM hmmfgPKVmLDGCHXi1MXswZw3x0DV0u21m9vM7FLSb6+owP+i/PusrsOwojKufimQq9uw Z7FpIgtk2AVmpAFRobrrCUY0PTNtHVL4NLXhlZbusF2GBqfvKh5o33/sSUuH3s1Gx7es XcJuZsRfl4KeyfPcxVVm3SJhtOfET2MV2CpVdEJ5lvKVqqI7gzzbDJiETKLUkc6oG8AS JuMw== X-Gm-Message-State: AOJu0YzwyaHc7phSiG5txDa9d9/OwHZCsvt98KcHZ8hBxWVc9FTlgeha NnNxBwBwdDuuAk775gKCZPj+D8qbjYvTO/a8WyjMSw== X-Google-Smtp-Source: AGHT+IGdKXhWgaqDCOWwQeD0F5VAy31nRgqYB+eh8qhwFEhBnhun3tjrR8wY0/z3enbgMBpooVTfGw== X-Received: by 2002:a05:6a00:2d26:b0:66c:9faa:bb12 with SMTP id fa38-20020a056a002d2600b0066c9faabb12mr3547315pfb.9.1692380804366; Fri, 18 Aug 2023 10:46:44 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 01/13] jobstats: change jobstats_abort to jobstats_cancel Date: Fri, 18 Aug 2023 10:45:25 -0700 Message-Id: <20230818174537.290222-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 The term abort is on the "Replace now" list of words. Use cancel instead. Signed-off-by: Stephen Hemminger --- 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; From patchwork Fri Aug 18 17:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130527 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 823EF4309A; Fri, 18 Aug 2023 19:47:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01A8043254; Fri, 18 Aug 2023 19:46:50 +0200 (CEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 342BA42FB2 for ; Fri, 18 Aug 2023 19:46:47 +0200 (CEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-68879c4cadeso1002049b3a.2 for ; Fri, 18 Aug 2023 10:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380806; x=1692985606; 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=BQIz7tfV4tPIpLQXnpAgEPBXJAKBAGRqsPm/CDydxT8=; b=LvctaVG3+QPTrqgsxav900bYrKkYg2+kzNqyCPLVu6BICbh6rVvnJZ2k8wIxU8fvjl ZwOyv3sTaZAlMi/mTkj4pVynE/U9k2DeC0jKyUpuEbPu7UKKQignATyToOeCHmlIJYh/ 4H//Y+8MLL7CLRGZy+EMSAH6HAXiMTCUftNBwHYVAzyiHAiXB25rrNyMX+0CZyEIvpGL 7oqiUmazxgE4bPeMOwzfZd4ggcSL686TP710OFqp3wtT/z8SMZJbje1qMo9IWsT9HQGl nMINUyDGVe3hc2b0LSGfrV0bkcG6KpCz/knPBAOYehu1ZdW/ZHSP8ETwRi7fyhA1toUY zP2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380806; x=1692985606; 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=BQIz7tfV4tPIpLQXnpAgEPBXJAKBAGRqsPm/CDydxT8=; b=hzcpFYchw6kvle7r+MCy0dBUHY0mzLV7oIwJutf3UBwPGwIys0mgKP0AbY738oBvWu 2uIiQ+soiyVmpfuGbde5wwomOSSPJ2v9cgaIz/oAThqlQ+5SePWcbNf9/tQ29FEO85aG 7RUI4W5fD4Cm88Y4+48pT88GhNTdz7U9iTN+8faJDz7alnQ7yW2jJGAUISd1J/siW0AG OMxVyMEu5kjWuigB+Rzti6l9wW6PaFdO7NjEa1vi4wXwtYN/1yfFEPzHSB790bSKnstB dRlpfnF6fTUGSNlkfBVQThxcWuU+t5KXzfZU6BN3Zl7dRXEIDsEOAgvOSv5wh//kyyrT FY+w== X-Gm-Message-State: AOJu0YxuqIAVNg9KsaaIu0r2kX1VXJU0vnDXAWuy/OfWuOnfDyHluD4U 0GrrIfEdRRv3LEvRE1VnaHUCS9HDGoSWuFOjk7/JKQ== X-Google-Smtp-Source: AGHT+IEHBS1xBIg+vK9v19T/pJBNkwM3Fi0dir+nym3lc+iK2CMVqg/tQL42gb8pw2MWOR3C2Z6Y9g== X-Received: by 2002:a05:6a00:24c6:b0:687:2f1e:156a with SMTP id d6-20020a056a0024c600b006872f1e156amr3522306pfv.5.1692380805746; Fri, 18 Aug 2023 10:46:45 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:45 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chengwen Feng , Kevin Laatz , Bruce Richardson , Konstantin Ananyev , Ciara Loftus , Qi Zhang , Radu Nicolau , Akhil Goyal , =?utf-8?q?Mattias_R=C3=B6nnblom?= , Cristian Dumitrescu , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Yipeng Wang , Sameh Gobriel , Vladimir Medvedkin , Honnappa Nagarahalli Subject: [PATCH v2 02/13] all: remove use of word abort Date: Fri, 18 Aug 2023 10:45:26 -0700 Message-Id: <20230818174537.290222-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 The term abort is on the Tier 1 "replace immediately" list. Signed-off-by: Stephen Hemminger --- .../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. */ From patchwork Fri Aug 18 17:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130528 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 6DACB4309A; Fri, 18 Aug 2023 19:47:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3441243247; Fri, 18 Aug 2023 19:46:51 +0200 (CEST) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mails.dpdk.org (Postfix) with ESMTP id B1E4E43000 for ; Fri, 18 Aug 2023 19:46:47 +0200 (CEST) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-686be3cbea0so1620423b3a.0 for ; Fri, 18 Aug 2023 10:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380806; x=1692985606; 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=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=; b=gmmDe+EDBNVMkOENEbGksg4K9e4pQxH+S7PChBNtqCkAw9OI0U0yhA/r0h68cP5z9p qggR/sYYgT9r5zN5ri02zdueL6H0fEW7zf677gGAb7DS10iDpvNr/ImMCuYbl+sf/Wcr wThCTgCpE/rAjenxCEu39Xau/qfr11sMc0yUWXfzsqzlYpgSrwS9fnwBVPaZLFRy1ln1 S6BWO+F6W8kkZ9c9LuxF12vntvUQNv11bdt+7jISldt57tlDPP4N2N1eBSwIiVdsr9U5 KWsrqJoNA66bAK6us/nN1oFupngg9JK+IrY2E98jZO8X++nMdVoNAprndDCJvHZh07mx vvJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380806; x=1692985606; 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=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=; b=V7JzB0sEAc8CP2BGuBKiX8++w6Nd3ilLG7g/aDHUbz0JCxOaayf56PtgQQ+xkvttqZ gXbR5KD2Dwopal9efeO2MR0kXTHhz3TqTVelICukyklBnQFtAIWn0nEAE+87zYPsY6Nc +fOXdJ0qQnF2kzverwvlrpsUXN8zQq7aEAHQt+FNLGoQ1spND+BBgGpFZAVR9a1hTytM AyPWuqoZ0ilIUmMHB4W/nEXfdAAXsjYo2JvQoEoz7m1PDb9inrz2ylmMmY+Tn74e2jLX XLu+Wz2TO3Uhc+PYQICIwpbZ8nb/vyYPGThXVns8NuK6vnaM48IgYjjG8uAoc615YZZ/ eiHw== X-Gm-Message-State: AOJu0YyeW6yl6cxjAWlURmSnsItaGTHeOMiVNRgl49AGmoExO97AhnO1 ZfqszoD+iHwidrqWBYv2ljBlxLMa/gYVfzGCF3A3yw== X-Google-Smtp-Source: AGHT+IFDeqkXaCtfXLk96ox0YhF4Kx254RhV5mG3JreS51CKKdCu7es1dafEjIbV6R9e1KhLv6gxRA== X-Received: by 2002:a05:6a20:918e:b0:13e:debc:3657 with SMTP id v14-20020a056a20918e00b0013edebc3657mr3334591pzd.30.1692380806565; Fri, 18 Aug 2023 10:46:46 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:46 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v2 03/13] pipeline: remove use of term abort Date: Fri, 18 Aug 2023 10:45:27 -0700 Message-Id: <20230818174537.290222-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 with cancel. Signed-off-by: Stephen Hemminger --- 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 abort\n"; +static const char cmd_pipeline_cancel_help[] = +"pipeline 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; From patchwork Fri Aug 18 17:45:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130529 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 D5BE94309A; Fri, 18 Aug 2023 19:47:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45CFD43261; Fri, 18 Aug 2023 19:46:52 +0200 (CEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id A27764324F for ; Fri, 18 Aug 2023 19:46:48 +0200 (CEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6889288a31fso829562b3a.1 for ; Fri, 18 Aug 2023 10:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380807; x=1692985607; 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=v140Igs8/O/MPbJDz/fW1i3xBzKpk7TOBh1N0xFCfXI=; b=fbcbSEa836IuKolugLSMDmFkSdLUYEfqCIBYDNlYnOqQTOWeZ1PnIK2sOe/yhPAtWR ZCd/s9WydCOCxFKbO3/cRrnwC1Wzm2dzOsgP8EK5dS7GSyQPnVz2tcTubx4/XBEfGzCQ xr+Af4i1HNl2rgH/FVevArDGgihYjecX3ZdNFa04O60ltw5Ckqn7jHlqxqpRsXtjgvTa 7ekuown4ZjkD8ReSNgTzIIwV3jOziEZLBfM+EAZS7K5W7xd3vzN63EC61lmep4Vr11yD sCQV2NbyQpe6Kn+NHZawlwXD/cgyRbndnoTrQN6CWnipi2cPn6On+Wq4X8H7m8UkcQMg EOmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380807; x=1692985607; 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=v140Igs8/O/MPbJDz/fW1i3xBzKpk7TOBh1N0xFCfXI=; b=Ya+VGdqYxpsBfZvYuK+mxkUTdd64O1j4ZivkmBaWX6uv2BfTVj8djngFFzpg3mc5Sr 853Xm+YwyLb5CCuNeNUWmd8B0Oy8oXlQ2PNukl59l1OGkDqP6TO/IPs95LhPtZM9as+1 HnX9pIqgeZmFVqcUgywOxTPHK8nqgxlA8P0+G1sijB0ZwwGufDNPj2ZkrYte5BSbwBgV TgTXZYeiOmmUPySD5YI1P4mXMZps0WgvxRiqtnEVGri0rGQqQ7I4/IUKUjjf2W+iqBm1 gvn+PBjjJ9gfY3RPN1GQD7cMJgaO+3oHfMsKix3UbTIPvd3pXdPiqOOndmOy3fniY1df +aww== X-Gm-Message-State: AOJu0YxoI3bPP5fJrqJiqE2NPoRuqRnbFAE9u+A8cxIjKL0yt+eoYTXi wznWh7MovAjQYXssDv29C4ocRNoWz36fSKGAGO4pyA== X-Google-Smtp-Source: AGHT+IHvWVwuPSysTRZuV1DBxeP25CbO0ZC7u8TBWkHJtnK3a/xXJvXG9mO9g0lHs+C9QcU5Pawxqg== X-Received: by 2002:a05:6a20:3c92:b0:13e:90aa:8c8b with SMTP id b18-20020a056a203c9200b0013e90aa8c8bmr4191071pzj.4.1692380807471; Fri, 18 Aug 2023 10:46:47 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jochen Behrens Subject: [PATCH v2 04/13] net/vmxnet3: replace abort() with rte_panic() Date: Fri, 18 Aug 2023 10:45:28 -0700 Message-Id: <20230818174537.290222-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 Do the same thing but be better about wording. Signed-off-by: Stephen Hemminger --- 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 { From patchwork Fri Aug 18 17:45:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130530 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 2728A4309A; Fri, 18 Aug 2023 19:47:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62FF843268; Fri, 18 Aug 2023 19:46:53 +0200 (CEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mails.dpdk.org (Postfix) with ESMTP id 9B0B94324F for ; Fri, 18 Aug 2023 19:46:49 +0200 (CEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-565e54cb93aso790158a12.3 for ; Fri, 18 Aug 2023 10:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380808; x=1692985608; 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=MOiRfoonKNL1XDAcXkxhNcIQcGuWGAlZpwNcv2Bb3Wo=; b=Visi070i6sGNHyQBHCMO/TWPheLND4xhxXaoifMh6/slIq+r2PJhN0TakN8llz6aJv OYNMKF8TnqfhBFHz5uZ6d/7tvj67n/iHdKlJTUaI5weizARem6GEPngJbThyGG74i+xD iToRAr+i5XKMhrWLxpRfFM8rKzSp0xfACYOAp/QX+MyfqK+/9aLNaqsnMNyREON4/S7p n6VuDKGIRb75DxX+hjUMZ/3cbx6kTodNglE3dRuc7steiToAcKxyLY4Xl+8g+zkyIoq4 1yP5CuajRGipKWsaFIC0e+rXfq4BfWD3Ru7ZW3c4EJ/8MdMnlKyapqXSOPxM07geI5jE 8wjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380808; x=1692985608; 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=MOiRfoonKNL1XDAcXkxhNcIQcGuWGAlZpwNcv2Bb3Wo=; b=O8s6El8AumLC/BrMF9dkq60YI6V0Y2BQ7UOmkGe1NTWbMN0InhH7GZqfQ7Pq4OA0H3 zKX8xmSYraCbKrwnko1w3V97lC087oKZsOUbtmECAt5uZWdIBPrQY2Yb6cFPjOWmq18u pD3ZQYAiWlRi35NnNAZPINlP83ErUt5O054qA3ff2dI8oV9xBe5tuND+vukJ9DN4Mm55 zBXo8QtcOoEN9+LI36krP7rIex7wLnehSblAIL2ToDqWbnabHcLC/j6B9lF1IJQYhkqn rn8KzDxe7BEqiibAT9jvnDJ7cav+b25CXJVUotuov2YwiOJ7yHZiz77ravGcLOLTAtxr o0CA== X-Gm-Message-State: AOJu0YwqwirG9CZSVIi2lUABgh6OGAsN58MOtIoJGs1rIahWsbl/I3E1 4qqcHJXoBG6WF8qKHc4qaikc74HE9Q2xgbRQgkdxSw== X-Google-Smtp-Source: AGHT+IGzOyy7YS+gVTNnrhJlNrcLHtD9aqz4hA+J8zE/mfbgBn5H2fp6/4JMsp+FNbMUi4R5W8KkVw== X-Received: by 2002:a05:6a20:7faa:b0:138:3302:1471 with SMTP id d42-20020a056a207faa00b0013833021471mr4808262pzj.6.1692380808414; Fri, 18 Aug 2023 10:46:48 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Timothy McDaniel Subject: [PATCH v2 05/13] event/dlb2: remove word abort in comments Date: Fri, 18 Aug 2023 10:45:29 -0700 Message-Id: <20230818174537.290222-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 Abort is on the Tier 1 non-inclusive word list. Signed-off-by: Stephen Hemminger --- 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) From patchwork Fri Aug 18 17:45:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130531 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 1236A4309A; Fri, 18 Aug 2023 19:47:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FE1A4326D; Fri, 18 Aug 2023 19:46:54 +0200 (CEST) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mails.dpdk.org (Postfix) with ESMTP id 405684325B for ; Fri, 18 Aug 2023 19:46:50 +0200 (CEST) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-54290603887so861400a12.1 for ; Fri, 18 Aug 2023 10:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380809; x=1692985609; 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=MPqA+VVh6xHPL01avdfcDGvKrPqijnu+23pJbIiFjs4=; b=nwpm3W6PWZo6JiJnnxbZZqgNNXp1Vop0vF+tn0jPy+2D+i8QkJTfpAvw+PF7bwiG37 eLscmEzQdNGYyTJHf8DAwTwBD6v3Que1grmIeVfJHOCqDYK3IyvJXc9EehBtp1clgtVC 2Zg/E+PgOwRXbun25QZ0AqpyljS4Myu4ab85ANWdxD2h5x5BJYksS3Of0KyWUYzfjA4F ucfwkXorv/d3xWZkeyUTQnjMfpF5JYJQT7qKmCDdQ2yJQ8+jdRGaqHFSrmfRHkoQ0k4D m7tvQ7WvWN8GdbWHtKtjRL/vCJL62xoeZE6xvxXJBMmad7XzvvQtAXLpGNskCKx4LOI/ Ooug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380809; x=1692985609; 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=MPqA+VVh6xHPL01avdfcDGvKrPqijnu+23pJbIiFjs4=; b=a9zu69yWtIYRAgkudyk+VylLqNcfsUGwVfXD9PCocff6leBPy0RB+XOj3KPSusQf7o 5ZaJxJ2QsEc7CjrLPKyv7aCawhJKlmsf7n+U045jMzeqNlI7aVsKB9LDlYBBez0cXAH4 Yae7JQLvSDJYQAgSLhKTN1nxZj8QyOeUCGwJXHxHQhrHbTRBrPEM61EWp4DqRfPgf2X0 7nG60PiEyCc+IfJeYdeUKmBAZbGYKT4xauLMbrKYwl3HSoMkH3wSgVLadVYWQo4jWf5e 7lbGG+xfa2adUsrIrCpmuOFOBZGtQLktbvpV1/0e3ttqUCuXvpkhhjjyY5G8yUtJtHv8 vzjQ== X-Gm-Message-State: AOJu0YzdKuRkQUfTNhUxvRiTp1+GnTDfgKxwqlX7NgsGXyEg2jOkjWQt WWeKJilk7knWzYJCHSM9uc2ZjgawCFTxbjmUbB9dLw== X-Google-Smtp-Source: AGHT+IFw2k+MFDqdtkdYtBpU/X/Rdxiyzh4ixfYzBK0sK9xvfubzxFk32y7w4Q8Hci6jFGGJgSdJuA== X-Received: by 2002:a05:6a20:4402:b0:132:cb65:b47c with SMTP id ce2-20020a056a20440200b00132cb65b47cmr4548985pzb.43.1692380809211; Fri, 18 Aug 2023 10:46:49 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:48 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad Subject: [PATCH v2 06/13] net/vdev_netvsc: replace use of term abort Date: Fri, 18 Aug 2023 10:45:30 -0700 Message-Id: <20230818174537.290222-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 abort with cancel. Signed-off-by: Stephen Hemminger --- 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, From patchwork Fri Aug 18 17:45:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130532 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 B045B4309A; Fri, 18 Aug 2023 19:47:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B004E43272; Fri, 18 Aug 2023 19:46:55 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 530904325E for ; Fri, 18 Aug 2023 19:46:51 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-689fa6f94e1so979997b3a.1 for ; Fri, 18 Aug 2023 10:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380810; x=1692985610; 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=5DonACvWTVF873wmCiDhN6zzNMdGMQkpQUyrYymwT0I=; b=4/uxJfS59KCZa+KU6DxmlbA9YP0CdGMLRduMe2faOgr7VNqjZixLNrgqVf54KIb7+/ z+UIVnbOktSddNXNZ14EHUxM0omOxo26Kv2VcmAB0UfyBeZDsqxITuAkPH7rXf8gju30 G9vMr+m+sMaaUBtwWui6VHPr9dK7A7iTPQgRYvU+FVXzYnukJquzO9cC8fvnw+aQXv08 GLhK/3YtTxeBeCYl9pxMTTjd/9GnVoiEyxI115TdBfNluVVOY02EeQBgiJJzAidlDp3Y q4s+zkqQlkCbaSGp5eQUqszyQtBIalAAPY3fJLaXdJpY860U1qgsUMoBjFYgOA5uYS7m S0ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380810; x=1692985610; 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=5DonACvWTVF873wmCiDhN6zzNMdGMQkpQUyrYymwT0I=; b=D3yIpjuPL7ZIAbjSbJvLFfEGTXtHAxU0iBpq7Bnot/fHcbs7Zaqu9ajCxobiS4aioK IVHO7iN5viQpyigPEAlNOO73jWLtWQ7z55Bn3NMuCNjX49FxYO2Wm9PxhGM4S29YY162 t4ZedONWAl4+wC5aprloUJ1/Wl8/UUXn7N6RCIz5GxTUDk7RyUOz9Yn8hIxVWbbCSQXT v1JUkgO7pYOt5gcjWMlWbvd0lBljMq23J+FK9KCk7SL1CbtlX90BkUkbIOBTS5E2DA1G McQVB7X6KVsfwdDF/vfXfs4e48h6CA/n/X/h8eAzooYM14OLtl3ZLyPs2a9IEl/aIJuu 1NcA== X-Gm-Message-State: AOJu0YxHHeNI8RoOuwzVvgNfINxT31X476QZbow0hWHUh5O0kRJ7ztVS Fzs0paZnqVWztuF91yfkHKBhXrokOGRozDRJGIACJw== X-Google-Smtp-Source: AGHT+IELuxlh2hShWxS3/DWFuwguyh7sfcH1BGK0xUCt7M69AWG2vyN9ozi+OfC+fvh9YERLCzxfag== X-Received: by 2002:a05:6a20:a123:b0:135:4527:efe4 with SMTP id q35-20020a056a20a12300b001354527efe4mr4594868pzk.10.1692380810330; Fri, 18 Aug 2023 10:46:50 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:49 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Long Li Subject: [PATCH v2 07/13] net/netvsc: replace abort with cancel Date: Fri, 18 Aug 2023 10:45:31 -0700 Message-Id: <20230818174537.290222-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 abort with cancel in netvsc. The rndis.h was inherited from FreeBSD driver, but ok to change it here. Signed-off-by: Stephen Hemminger Acked-by: Long Li --- 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 From patchwork Fri Aug 18 17:45:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130533 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 5876E4309A; Fri, 18 Aug 2023 19:47:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D94EB43276; Fri, 18 Aug 2023 19:46:56 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id 5066F43262 for ; Fri, 18 Aug 2023 19:46:52 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6889078ee66so1003355b3a.0 for ; Fri, 18 Aug 2023 10:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380811; x=1692985611; 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=6IDHGalblq47mylxPUD5jx9nzP3jR3zvYuVOQ6+xW/A=; b=eXUcUp+NRoj1N+TC2eIn7o2TcsvCGDKXIUHx3pCFbpri54KCUAgbuesDr+qaDhR71b NhQGDTNmYLPFgvKpd4PpgFU9gPlaEGI0fGA2KpdQzE2FAAMfchCch20T1i85BHXwCTSS zByOYbFB41MFcPo1GRaJFeJfYQdA+9hNlIiOiEAhJRia/Q/P81dHTaR/9Ffn3JxCVGiy Gw++ddieOPL0L203Sf5CSQV8jvy+m5rASN0vy5kRmt4fu6Pssvgna8eodUBnANF+s2lk uiJ7aE6r1BTprNgyObbgSA8Sl9abS+93/wiZhiAidMj4qW5CR5FtYsMkgJLRmNlcmbiG jC5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380811; x=1692985611; 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=6IDHGalblq47mylxPUD5jx9nzP3jR3zvYuVOQ6+xW/A=; b=UtU1fYk6Fw8RegUlo9NZ5qevQeQazBcErscJdGjmLJndVHM10ug6tnj4dTY3kaCb1N pZ8uAo1A+EjsHjS6ekJe43+7DidB3lFmdOPxQA5fiRomGH0dEQKgfFvdLdPt4jmPcrWO dxfKVcALnmafy2H+ibgQaYW8NxSULHZ4AWHMPNEh4L+BzfojQGDUkFKMZgi3tn/Xmr+7 HW5u5kxMtBF6cpiI1nYZQ9kDy+oZy/iM53YHJI5tb3MAGxK/qOGfR3h1DljAecynE8kp H85kTUbJEJKMiU24+oYiihs7fNMZNrY17jo5Wz2D7MVX4esSSr5Bi1b6AnQt2t1qk3hC 3PXQ== X-Gm-Message-State: AOJu0YwKqvTLwryltDQPrnWM1oBi2GwrOn+CJRo6xUqRf6EaYJjQ3mCM zFYUgfPx4j3rv3a/SbJ+RIXiuWc3Wcg882JWmKCkRQ== X-Google-Smtp-Source: AGHT+IGetw43ms68jRFpHdifLlkFqnfk8/aTdbqN0ClYzecwQFAwVBF8Cc1gv6QPWnY5oeKmvcsXqg== X-Received: by 2002:a05:6a00:22cb:b0:687:2d68:f30d with SMTP id f11-20020a056a0022cb00b006872d68f30dmr3867231pfj.23.1692380811266; Fri, 18 Aug 2023 10:46:51 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Boyer Subject: [PATCH v2 08/13] net/ionic: remove word aborting Date: Fri, 18 Aug 2023 10:45:32 -0700 Message-Id: <20230818174537.290222-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 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 --- 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; } From patchwork Fri Aug 18 17:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130534 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 A0BA74309A; Fri, 18 Aug 2023 19:47:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A645043287; Fri, 18 Aug 2023 19:46:58 +0200 (CEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id 4D7E743265 for ; Fri, 18 Aug 2023 19:46:53 +0200 (CEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6887bc25e6bso987201b3a.1 for ; Fri, 18 Aug 2023 10:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380812; x=1692985612; 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=GVPxBMIelFLO5Es19pnGYynkmONQQ8M1W2UKMjai8to=; b=clvTxg5td7F128BSc8Ov5KLMSoRgboVAjuiAIByKJCtZDJXIz8O0KCQNHcBnQ0tSEI QhtdaV4Zkle2ub02aW4koAOOCM4JO83ErVSQ7KyyD41YMvhqpmwivPIb9JxWcy7csprR r8iOQfef7nU8Kq/wxpAGBMfORp2+wpF7z/tzWu+BlsT/pODqQZP21PD4pBdj8J1GbyhL iITrD/bZ4P5V/9VNRLICQAOu9Nkwvvy8mjL+ZXXh1P7FIIOAuho/o4lNqM5u+D86bIpi fxREm14NubpltAuuZsyzR6Nw9PmejxcL3UtjSTkGT0M3iP92ueiUWPdX/z6XW2jQ1Du5 G6Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380812; x=1692985612; 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=GVPxBMIelFLO5Es19pnGYynkmONQQ8M1W2UKMjai8to=; b=WZ1pt6BMY4/RMdA9qlJhHuHg0NUn5TreN4F8QSuZugfL0XJAFiFQ+O3lkTcInIfsEI eNNATVFwuUFIdmfqiKq2FOqFHp6fezly6e2T8UW7PbvQcR8kjuTsJIwv2NaP3KwYknt8 Xy5Lj8vNEEvYAvX/LwDLyIpwQVTvzKrJXw3gA1BEngK7nSY/a6jeOq7bjpN5+OzM0xEn XJMO95gzB7SUPoNW4ngyUP3wMTJNNMl6Kf2eNHxMOsyFd5+em4anIf/abHz3vhwEcu52 lYNT8Fhr82iNmgg4+XS3rNjAQh2J1MlT0Q+I9A+bK3ZFU1k6uIprT/buLoLEZv96sohj G+3g== X-Gm-Message-State: AOJu0YzKDXH0//Xrobq+lHnltxbOOxTq467IDHdSrNBr45dnIMRRpQNn pBdOwCZq/+aAy07Y1lMBIesjbR0+zMIPsYpHxoe26Q== X-Google-Smtp-Source: AGHT+IFBzfAQt+2XPFZy1k09Be0vriCB5VAcWVJdV2EsIFQ8jiw0z/KstWn+z1VqifA3ipgkqZ9nww== X-Received: by 2002:a05:6a20:8f0a:b0:133:f0b9:856d with SMTP id b10-20020a056a208f0a00b00133f0b9856dmr4884598pzk.17.1692380812192; Fri, 18 Aug 2023 10:46:52 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Julien Aube Subject: [PATCH v2 09/13] net/bnx2x: replace abort with cancel Date: Fri, 18 Aug 2023 10:45:33 -0700 Message-Id: <20230818174537.290222-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 Don't use the term abort. Signed-off-by: Stephen Hemminger --- 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 */ From patchwork Fri Aug 18 17:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130535 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 CB5FC4309A; Fri, 18 Aug 2023 19:48:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A55D24328D; Fri, 18 Aug 2023 19:46:59 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id 38F724326B for ; Fri, 18 Aug 2023 19:46:54 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-68872cadc7cso1035792b3a.1 for ; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380813; x=1692985613; 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=Hp4LBP5qek7aAFwnandp539DqID/MzGiZDdJNeU6UQE=; b=yXSkISGH7XugA1itWpj7aXXM2x/FTbwrxAVLDiWgpaCews6X3Asl+weVrEubdL3VRp fCHysB93iMz5o5AWYDOVmPnpb6xkzsYAMj63ZWFCR7hzSMbyskfNP4XC5Pvhud6PfRj2 i1+sRD40NT6KfjyyP9yZANQfJMB9LdU7VGdjKosbcZYoOZQzp4Eq/lLBYAtqtAyHKOMx Z/bEh+hC0WwHvrehnNzKN9Ro/GBK8ArXmDKDejbzH34hcHK9ZK/BHn8q3xm+BHL98M/3 cR3k0kt9YROClvejsrfY7gRwbZleVIDeemr3gKMMBGovPMH49wvaoAc+jxhyl7XAW48d GB5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380813; x=1692985613; 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=Hp4LBP5qek7aAFwnandp539DqID/MzGiZDdJNeU6UQE=; b=AboHxymKXq+vW9ch9OxEt/RyoaMn2EjBxI04DBOOk/SeS9qeSITl5/6U/811l/pvQi L4AuFGBzN0J2QZfT1cehyxMTV1PM1ILHMUg2bm2/IYmglgukYQKN5ggHb0vbO33O4XEf EVMoaHokhaoFFlSbQQTmxtARzM0ey7qMCJsYGTRdwRHiuW+lc7xldFyUBSyTwb1IL9OJ aEp/IxEmK9flUWmn+0LMIgqWfwNtWaFUNWD1nI9PeAc7whQzF3LTybbn6GxsKNpvHJ3P OWZ6ry7opBetU8o5KjKl791JpvGsVxAuYezK1/mteUhRayvU+uGWDinUImcaKwTQBCwf G/pA== X-Gm-Message-State: AOJu0Yzgp9LikY60Xzi77cbRBGFr63sKjik8uFCVa692ci6OzLyavbPz K1g0ldaXDGTNtw4Cds+FtQO8T9TbUCp/669mrxXm6Q== X-Google-Smtp-Source: AGHT+IFpGkqHD+JibzP1JdBiVMiqpK/4KkO2YNnU0Yd1TGWjWFqbPoFdWiR6ZFYsghb1QIXaQioXyA== X-Received: by 2002:a05:6a00:139a:b0:675:ef91:7922 with SMTP id t26-20020a056a00139a00b00675ef917922mr4097880pfg.4.1692380813147; Fri, 18 Aug 2023 10:46:53 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 10/13] net/mlx5: replace abort with cancel Date: Fri, 18 Aug 2023 10:45:34 -0700 Message-Id: <20230818174537.290222-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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..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); From patchwork Fri Aug 18 17:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130536 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 D2D224309A; Fri, 18 Aug 2023 19:48:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B745B4328B; Fri, 18 Aug 2023 19:47:00 +0200 (CEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 0F7EB4326F for ; Fri, 18 Aug 2023 19:46:55 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6887918ed20so1072642b3a.2 for ; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380814; x=1692985614; 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=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=VqNsU3pKTI8Hcgaeh6++BGPnkiwSJFaB6LbNbZf0sCjP3Ni+mwn5I8Dti1jpVDLdPw sT3ftg5UoV72tO24sfzNT7to7Jsj5x7MzcDZYcxrhBk9wkmPZrMKkCGAIEIUU2r9F6gx nEPOaV8shuh1wBE7cNMobGrTGKnMEnPzypxbBA8Uo8L7M5fDbnPbgnPgxSrdcliOjx3N ACX6JcPTb4AnvvFhz8xjUP4OvKjLgXq26hSimbxDTYE7/hC34vvUL2ZAwFiM4HJ8UVzu qzbghAE83JJLklPUEZoQjTJLnW4ncBmWSeSKghMirzGajzGnex/oaVgFxhZ+i42FpaGV VJxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380814; x=1692985614; 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=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=A6mC8ex3pFb20xEpiXtvSl6cIZx/m0tav782TCx3C9DY4HwbOaiRQukokYH2yWqMS9 HPhuq6TX++i6DfKczED6kaH1ydSIJDDoJRohMja2EM4TOqskp9MS65aws3pL2LHOnt4l Jy1X8dQYYj/sqVJdN7mFB3AOrRq1cwuK4POsC1JMcQa/32pB343E+vvRXRFpPU9SErKW lg6mxx+zYMs+qebC5lul/7bfOKWxN+dJlUmoF5aIzSVjr2M58+YdQ/P7kxB/kYdPbfgO KiYBadqy1IVpsyt/Vh6EN+ArmePDYARKcYuok3pwP4GwV87i2vYePqaKZgrb58rnOAwz YiQg== X-Gm-Message-State: AOJu0YyQ4/UBR4uNuv2MwzJuUeqvFiAOuHHKj7D5asDtcvJRk3LnrQMa oXO9iERq+6V6r5k0QZsHFIGsjoMjIRjp0D+Bq4eZIQ== X-Google-Smtp-Source: AGHT+IF+bvo1UQPOqc0xU4CTbAfKKObTaMp8EsqFhYWYwwC/GugZyTYP4ubHGYe3gnx/n5xm6F9VMg== X-Received: by 2002:a05:6a20:12d1:b0:11d:8a8f:655d with SMTP id v17-20020a056a2012d100b0011d8a8f655dmr4759077pzg.4.1692380814019; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:53 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v2 11/13] net/softnic: replace abort with cancel Date: Fri, 18 Aug 2023 10:45:35 -0700 Message-Id: <20230818174537.290222-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 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 --- 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 abort + * pipeline 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; } From patchwork Fri Aug 18 17:45:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130537 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 CFB804309A; Fri, 18 Aug 2023 19:48:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C260A43290; Fri, 18 Aug 2023 19:47:01 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id DD4C843274 for ; Fri, 18 Aug 2023 19:46:55 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6887918ed20so1072656b3a.2 for ; Fri, 18 Aug 2023 10:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380815; x=1692985615; 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=h4dQ2POs2n+MOVrxg9dipyhnKFvKRmt7vr/ZSjKz9i8=; b=WvnKBVHVEpSrTCwiD/4ItsNmQgffBmit55//KlXw6v2fUdKzXg1sa7B2hXFpBruL5t IQcpQlfyCGnqVsUYI5EJd4C+roUpfz3TVp/wKId9Z+nqZe7oEDPZHG9du/SKkP0O0fw3 GEBHx0mOjGeLy+/TsFT83XYc4UOBEIYBVkPy1pdXol2PWdWWlheHQN/37Ur5oY5+n/Ch HbdLAQX1T0JDuxg+jHlVVCdD949Gl2C1NbCUa48KF5SWaB2O2cDFxgrZ3Hyl5AtsAxX2 61lXWFfujmYSTJwmPqe9khjv0A0rSrmNrgb5gA+qi6fUW6VA6w598sjuH8Qh9aL3B9VU seuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380815; x=1692985615; 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=h4dQ2POs2n+MOVrxg9dipyhnKFvKRmt7vr/ZSjKz9i8=; b=kT0YKA4vaHN0arxHKMDTpOw+1Bex5CQKrkmM1OHmqWj0B1hhxDykouL53rkeq6ZlVU fNOck4QyQLl8BU8halYzdR7qdh8/PU5LrrE49QZxWJafEiSvHm0KRB21AvUos0meNH3v rH4XnYqywky7vzHBsaxVzZu3fG1rzMytQKkRXKTpbJtoEtQMzBM2wsdB7/zTQFJJqTlT 95KGQMFzDE49BinrcozlUmEWfsJq+vfh1Tw6SpTm3S95D9SvrfoJUtIx4qf+M02+nH+z pPl53Fs9ljU876ocJ1UxbxcFMTnTWfQdfJEhdKbc9Gt2juj7dRPfocLrAw3ZJlxPWh8X lLMg== X-Gm-Message-State: AOJu0Yzf22r1RanGyQEaNT3/EDOUH28zH3g2pWXbuSkuUX3bWavPLrN5 A8VD49FXFveA6HmXdeiNDa9BbOYgdps+XeNNj+E6Yw== X-Google-Smtp-Source: AGHT+IFZ+RVxQaLT4BqQH7wxNNHUXQSPCZ8kx68VlnxgW8DgdioIIsx2+1ugMp9TjHHdjRR1TtijSw== X-Received: by 2002:a05:6a20:3c86:b0:138:2fb8:6a14 with SMTP id b6-20020a056a203c8600b001382fb86a14mr4628443pzj.3.1692380814921; Fri, 18 Aug 2023 10:46:54 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:54 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v2 12/13] net/mlx4: remove word abort Date: Fri, 18 Aug 2023 10:45:36 -0700 Message-Id: <20230818174537.290222-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 Avoid using the term abort since it is on Tier 1 word list. Signed-off-by: Stephen Hemminger --- 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(); From patchwork Fri Aug 18 17:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130538 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 1E59E4309A; Fri, 18 Aug 2023 19:48:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0BBD43293; Fri, 18 Aug 2023 19:47:02 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mails.dpdk.org (Postfix) with ESMTP id BC3384325D for ; Fri, 18 Aug 2023 19:46:56 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-68872ca740bso980153b3a.2 for ; Fri, 18 Aug 2023 10:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380816; x=1692985616; 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=FXfHoITIXKtskf4Yk2sBcoNEbqQ0+cp/jvCbRjceZnw=; b=0djCmw4B5XE9X34aAYHFJzto9rCIXO+X84pk5Q4yRmJ2EuP8WNqkVlYdEHC/7YRbYY qTJi1aWnyD/r35v9Ks/Kl9nGFmVURbjOhTg9SfCQ3nhDFc35A6cSuQRRT28LJKF9G+3d 0iXkUudYGnygcPfjxbGXcA1v7hh+3efGQPs52f8TepfU8Rf22R2IAo4tfA3y4JiPg8tW HSGLVKzCym82SrlK0MTyzrsTuppdNQQJN8CN3wg5j7ZpTxXVuTPkX1MiwY3FPVoQAGWg TfactEedllbG9dhdJ4U58aS6fMBNgFFV42/qez4oiuvlSGCwjJWbejb4WsJJtzM8fcp5 Bxcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380816; x=1692985616; 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=FXfHoITIXKtskf4Yk2sBcoNEbqQ0+cp/jvCbRjceZnw=; b=EG66UElUnbRSXwoE+YSnBAJP2ElXNpVsXIDHeX8CJyhgI36H92tbGAW+kuuNPev7uc BSCnP7EOar+N6zgE3/9zmNtr7G54E9wax7GZU07nuu/vh6PgjipSThr3LTYtB2MSiYdr O3QD6bEzMs84AqXvm/PIko2nS9aSaKJ4pn5KGvfcEe8Qzj9S9xwGpX5s3glpAiuyDvlO gGek9ggoUmok5GbRBVPyKAWDSWbP479o4JFWSQoxXqQkRFe8YmRtuq+3AMOhM9xLj+qp SvBTRQYhBI3exq5nscXYftlwd4n6YAOC3dHnXGTq9gCMIQ0Ony/QRCUQ/1QtsAJTYh5c C9zQ== X-Gm-Message-State: AOJu0YxXxjvN6DmN/T+msCI01Ub4bs2WrdmGbT0mKrWFmlZ+vpWdZlXA RSM5GJUHNY7lssVxESWF+2EBhTufWg/or7vb8j1kpA== X-Google-Smtp-Source: AGHT+IHYel7vYUa+yeDjAJV013KFI1BQB52KHZ+WnuIqTnK5om575Bg3OrD067uo/XdTkcZEqdpQjg== X-Received: by 2002:a05:6a00:1593:b0:687:5c3f:d834 with SMTP id u19-20020a056a00159300b006875c3fd834mr4495741pfk.11.1692380815763; Fri, 18 Aug 2023 10:46:55 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:55 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chandubabu Namburu Subject: [PATCH v2 13/13] net/axgbe: replace word abort Date: Fri, 18 Aug 2023 10:45:37 -0700 Message-Id: <20230818174537.290222-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-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 Use cancel instead of abort. Signed-off-by: Stephen Hemminger --- 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; }