From patchwork Fri Aug 18 02:52: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: 130485 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 14C3F41B5F; Fri, 18 Aug 2023 04:53:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5159143249; Fri, 18 Aug 2023 04:53:03 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id CB32940156 for ; Fri, 18 Aug 2023 04:53:01 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1bdc8081147so11300155ad.1 for ; Thu, 17 Aug 2023 19:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327181; x=1692931981; 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=uQdCbXJbIpFI5Z0xkqfebtl/6w3Wp8NlhkMPULMVboYGnQxaN4TmRX8oWIRLzIbkx9 DJ6P35fIktX9Uf7WWAdWo6PneXjBPwnzLBxwfi5w8jvaKcxMM7sK0ODefdTXlEy6REFW uo5unZAiDNK49EvVDZ9trIwXJlfLBwvQHRXA77KknQmLJKDzHGC1vzgcZZRV1yGU/zk5 +nSU3y0lxwQ2kmJdSZBRZFxA0pIQwV8/IuNHABh5iLcKB3gWey+oskp0zsZXwel9CcBJ Ohg3X5JIySq6Uz5+QtPKVU7c7WFy1gKl97P9ksBoIBLG2ymHJm2DViKRyX7egVK3ptqh PpSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327181; x=1692931981; 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=ldwuf1RMXTD4J6ijLQ3S1LTBhjciC+09OvwVsZYbQ1AkjxI7Pr3Vm0hRDhDhpxdTCC EyOcXq6plTtZvHtMlblcwJRuL1tjvn6cLHBZgEf9wscEWd53/wUGzZ8IxRcXH8NrHlUV Yn32iIGl7XOkXZCSg2HN2IFFislamcehixPYkRJJWW7Z0nthTM+ZWtd+sTHwzUwFuUYh PC7PbW+0agHMKBPIH+pXYqc04TKTr/wF5A39j3R0uN9UkQnHcCwgpj0Ee1Oxc5B/vp7W qlKv/EnbS1Mca9pajQOuCGytLGqwMBZ/AqMXTDu9hji+ayDT7kC36tdmdWJ+Rt5L0U3r HU7g== X-Gm-Message-State: AOJu0Yw6p4ZVYpdPOnpaslnmHUSr4jLtf0jVFV7DWBLHumql1IQEOwOF UGkFZ/4snYENsJ9fS6lJTus4srvhR+L7rUWyuKbSUQ== X-Google-Smtp-Source: AGHT+IE+7IFCyOGWDeNpZyPT3OOdCo2TsTrv268mY0reNh03GVMcrtkaytKd2ovaBbPNamuLMFqPtQ== X-Received: by 2002:a17:90b:1650:b0:269:4fe8:687 with SMTP id il16-20020a17090b165000b002694fe80687mr1536863pjb.19.1692327180691; Thu, 17 Aug 2023 19:53:00 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 01/14] jobstats: change jobstats_abort to jobstats_cancel Date: Thu, 17 Aug 2023 19:52:36 -0700 Message-Id: <20230818025249.33994-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52: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: 130486 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 138BE41B5F; Fri, 18 Aug 2023 04:53:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86F2143000; Fri, 18 Aug 2023 04:53:05 +0200 (CEST) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mails.dpdk.org (Postfix) with ESMTP id B708643251 for ; Fri, 18 Aug 2023 04:53:03 +0200 (CEST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-26b3f4d3372so325356a91.3 for ; Thu, 17 Aug 2023 19:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327182; x=1692931982; 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=PQVuAH+fEGuca15KSNDjgJaPFTugc0A6FyFUOJKniBI=; b=paMBLVeaCOBDBpUFtdWQUFCX/geRxKEtbZC7+vn4FNeLPwS0ebmcqERNQ70kQDsvVe VWFD4+rR7vMBn0pWiLNZAogzFTwxqdHZOfPlQUAGkSSzwmb8sDYHApTZdUyg6um+Ws86 lLzMBr7/nZQzhJpvOrW+l2ZI+mYg4+ilvtAOmrQ2k+GZa2nAofPV12vit3egup863Blo oKAylsoTSjZVEeQ4k3Z5RpiuEqQ45aRmlx1xUQ9Mik8dwb06MTFPVkLSWKKK3ont8P9T 9k5QBHPtrhtN5snZXsBNubf0UZv4aMn4L1hRepESF7U+G5G7RtnNlMq0AeS8hyuaujBL tkCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327182; x=1692931982; 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=PQVuAH+fEGuca15KSNDjgJaPFTugc0A6FyFUOJKniBI=; b=L5LYeoV5IDlQVjqbSdKN3Uyk7N4JLgrTnt+t+vw85wKeGen0PCKURbmQczH4hmQ4m7 Xn1gelk/I2t1HFE9QmpenEReDuOBuERJcpASQw638xsZ2gxYZ88zDeNDDQlOFvMEJnex U5C/IpYFsO51ztZdZnj4SZkpfSonzmj3F4d70nGR7mDFoKKGVGtHVDRscgDFgIx53D07 bS+dHeloslEGPm0VEKQg+D/6qAubQm2jIGfaJBkv2J/4qxkoovuk4KulJxRQzJtTHQq/ h9LtaobKCOr659sae9kyEx4OBezAFnSV3sEyhrbWPSUSK+f5Qtrnmo9K7kFKdgxpotPu A2GA== X-Gm-Message-State: AOJu0YwGsFAB2n/gTvreH2fzOF5npiGm7wdLJiMq2+2E/+NZiKR++IC2 r7a+9H2WZJVkavOjL9+RCuNTY8m08R+PCPjUE8hhxw== X-Google-Smtp-Source: AGHT+IFk8vepz/MSh0v/MXwg2E1Bz6gYst0GvFSTz28i9fdCf/TEQIQ/cxbe8/PDBAcG4AHJrz9HoQ== X-Received: by 2002:a17:90a:d347:b0:26b:4415:7165 with SMTP id i7-20020a17090ad34700b0026b44157165mr1280069pjx.31.1692327182220; Thu, 17 Aug 2023 19:53:02 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:01 -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 02/14] all: remove use of word abort Date: Thu, 17 Aug 2023 19:52:37 -0700 Message-Id: <20230818025249.33994-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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..400bfffc3be2 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 cause cancel 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 cause cancel any pending changes and * return head to its previous position. * - throw an assert in debug mode. */ From patchwork Fri Aug 18 02:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130487 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 A67CC41B5F; Fri, 18 Aug 2023 04:53:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDF734325D; Fri, 18 Aug 2023 04:53:06 +0200 (CEST) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mails.dpdk.org (Postfix) with ESMTP id 60A0C43255 for ; Fri, 18 Aug 2023 04:53:04 +0200 (CEST) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-26813478800so348036a91.1 for ; Thu, 17 Aug 2023 19:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327183; x=1692931983; 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=/U0rlONnrIXvx4fM89GhYXCDumMraqATcpJzMBFOmfo=; b=vpc7ID7nzREhVJVFXLpz/cLku5ol/NqlCo72vmEQevazRi8KsGLjy/IKDRP/FaaD8+ +OwxA31AUHDfiAVCeGluNW2+Z+tIyOeTY7kXOTrfy+8RDCageXVb8bxGvvaLd/KKCZvC QAADoQ+JmjWYwl+BAw+Ra/47DyJ8xyOA61qt89lH5FTpf07eEUAZJLwbu4Z77WJTRWY0 S6tt7crPAoXeGiD93shB9sP//diqhfBAKhh/4YBgurRZzTr1Y5SxOBojHFWs3ygA/4Ae 9GurTzlt6H3H4dS6PFlBcCh0EBQ1BhmfbEDR2yGoU+GuOIJHW9UUtvl6JHHiiYCbVRLv SA5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327183; x=1692931983; 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=/U0rlONnrIXvx4fM89GhYXCDumMraqATcpJzMBFOmfo=; b=grBp29ZeiSsI1L3fSb0ahLA+arFfqlkE8eeN/Apl8smkhhMhUqvjHxHvjMfGiOVXOY trSNI8tUYy254BXD2kCCHg+ReBZBU8WPhBS2fMEZ5qjKF3qheLG/2yyIYvbJIkpH0u4q vZOphg8CCehOGf14p+hsyB1ibfFYL+8x3A8XQHETT2TN4wUd92jzRm6wktDBHY4F/ZUN DCqobeDJSCbiSiPneaTQiDOr8Wo5TjJGdEVbuH0iuTQF3NOe6CbiArEcC9thRKD5C+QU bwei35V5k/cwCRiQVzwUIqIGvh4dPFPmkGK92Rql62F81sTfLadbERbhwkhM3eN7ADqb Mtjg== X-Gm-Message-State: AOJu0YwM7HULhysYTfFViPv8089Ej3zgDn864nMwJIcaNihb/xTgpb+4 ZaSNPPm/+t0oouBOT8RwUctVfTOHTHgSSh74UCbVFw== X-Google-Smtp-Source: AGHT+IGt0JaVhqRdPeJ9ULES8az2NXAyuajpEQG5VVTpm4rqTyrkBCDUCp7jjD3Rw5pbzHSYnUuFVw== X-Received: by 2002:a17:90b:1a8e:b0:268:c5c7:f7f1 with SMTP id ng14-20020a17090b1a8e00b00268c5c7f7f1mr1155429pjb.29.1692327183026; Thu, 17 Aug 2023 19:53:03 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:02 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 03/14] pipeline: remove use of term abort Date: Thu, 17 Aug 2023 19:52:38 -0700 Message-Id: <20230818025249.33994-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace with cancel. Signed-off-by: Stephen Hemminger --- lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++-------------- lib/pipeline/rte_swx_ctl.h | 8 ++++---- lib/pipeline/version.map | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) 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 02:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130488 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 92DB641B5F; Fri, 18 Aug 2023 04:53:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 581DE4326A; Fri, 18 Aug 2023 04:53:08 +0200 (CEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by mails.dpdk.org (Postfix) with ESMTP id 1695643255 for ; Fri, 18 Aug 2023 04:53:05 +0200 (CEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6bcbb0c40b1so450000a34.3 for ; Thu, 17 Aug 2023 19:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327184; x=1692931984; 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=1fhoi+hcR6PauwynPbCXhE7OxxF0DCkS+TarCv4n564=; b=PTnWl4D8hDitRSai6AcgpYY1lcXw5r/w12r6GskrwBGbwMbrmc6mlyCYB+xbTTQPZc np9OWrJSpG5Wg8E5PnFRW5wXsdLDJANgfcz1xshlbfrWOtjQB1YqSgRCg1CCEF8ck/Q6 sIarvOfmLnEJhnZuJdOO+vVG1Nxk5o8XIZcP6pQztHLwfvveflugZTP3cEwfvbVhUFmA 02baalpi+Fjd0Ev9SIU0A5cf4qbGV9I+bHqWton/Vk4jXa113zupJENA1mpbCMx41kku 6CwPmE9hKK70s56SvvMOcthhkQJkDMb8N3JRv5Ls/LG6P7rvzo5mRfPEnjzTB3H7VAdP twjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327184; x=1692931984; 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=1fhoi+hcR6PauwynPbCXhE7OxxF0DCkS+TarCv4n564=; b=EsSPzitxayGc7PSn4Cq6orJwSZXGGWmVOw/O2/n0BLUj7GEAsx6WytjVk1osFrRVwG zzrmTRV1MrbeK/tJaUGuQG7Mn3TdisIvBJ7XCFo++veRlJcXboa1vGm0BDfpbBg0BnFH SBElXpGI7MIbzVkB6X3L3VrYyZwqeEza8j+PPSc4qnrUXd98Vdv6jqJmsUKlOC987Ceg T9lMikIVxIwOJzexpDLVacX2fpN/cdqmB7NAV0yeDfxLmjIkxswP/9I6PAIwYnlukPlo 3mTiqJUU+uLr91MadNY33Hx2Vi0LFjd8pTag8zaQKjouGjj1TiGv5GA+duz3LXUuQgma whtQ== X-Gm-Message-State: AOJu0YwoZXMWThuSVv18NWX3gyBpn2tmEtgtmWZZc55+DgRVbVX+yQQu EDdx3X/5iAYqduP5UgE2zc1J4QzeyJe//mnfwaBhmg== X-Google-Smtp-Source: AGHT+IEO6/YK3it/2xbx25dX/wHt+lWs9ZpkOx27uul1IGD8a9oVBuqH29TRTcxMBoEgU24X9NiWEQ== X-Received: by 2002:a05:6871:707:b0:1be:ffae:29a4 with SMTP id f7-20020a056871070700b001beffae29a4mr1514961oap.26.1692327184039; Thu, 17 Aug 2023 19:53:04 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jochen Behrens Subject: [PATCH 04/14] net/vmxnet3: replace abort() with rte_panic() Date: Thu, 17 Aug 2023 19:52:39 -0700 Message-Id: <20230818025249.33994-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Do the same thing but be better about wording. Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 380f41f98be2..98bdd6523a4e 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -565,9 +565,8 @@ 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: %#llx\n", txm->ol_flags); } deferred++; } else { From patchwork Fri Aug 18 02:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130489 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 3651741B5F; Fri, 18 Aug 2023 04:53:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8130E43270; Fri, 18 Aug 2023 04:53:09 +0200 (CEST) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mails.dpdk.org (Postfix) with ESMTP id F3E0B43247 for ; Fri, 18 Aug 2023 04:53:05 +0200 (CEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-564b326185bso362281a12.2 for ; Thu, 17 Aug 2023 19:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327185; x=1692931985; 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=g3pakYaJb4Etpxvy4Y2Wv7DyN1hkAYt9X275gmnbjWmrD/eccBNNX+BEEzvuAAkjhu r5FWoWwfSamVbWiPaIFxzWf0X+ipnuAaql+3ioDtnT3QCVIiE7O/1GeOUIbypHlHsbvl MWQNDHHcU27bnz5ILaQDC5lL76lUi8im9+z9pbNFq5dT1gzYxMewvg2hHCPJuifzK3fd GPTvTTyVaR4H/nckdFJlzUIzh23KQ1I2AxOOUY2P0AISojgbd3h9AIWCGz4xRA62jtGm 3QHxGhcXtbh3GtFVJRumBvAlO/alkqD3b7RMqqDF1FC14472HlLwwc8wCiZ/FQilw2Wj egHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327185; x=1692931985; 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=FAmj6s4BX52Gy6C2E8bloY0ttTb/9zGqyVNXWSAW/kxLUoOld3dMOW+3f3TX3R3wdN NeuWyHPEU5ln77p+c/sqhSX9Ixepx0dRO/KvcObIW811T+vIaAqNRJSut6Q45diUrdGl Ss3X05AcJonxywk+x/9o2LTDZjeNnIDeK+3ELFR74YsksqciGiPQUclKAj4te7mAeNs8 W5tSjJPZVuUVAga1/KWUsqUtJkxk/6LYVBFMv9aN2VZICW4DJtR4hVr3WaGa+Gl4l4G8 liHbxEYQI8Bp/oay5WUelnvB+3UfaoPLfL3H5meqia0aIj6biqf6oLHV49ceW+WKKo3l Nxsw== X-Gm-Message-State: AOJu0YwoxgxQTImJtaLzoWYIPb/C8hxJbcNAGUsMf6ESmDgrbr0TiqZX 2VfwzvC4HL5nYCRiFm6jqFpO5nVwOh7xl64zHWsuag== X-Google-Smtp-Source: AGHT+IFOPbGRy4R1otceVNr6mfC0OVFQTtHFpymihUxuJgjM/0bZj0Zaw7fqbH5nlcknxx9cUYoO9A== X-Received: by 2002:a17:90a:6806:b0:26b:202f:ff6b with SMTP id p6-20020a17090a680600b0026b202fff6bmr1268633pjj.13.1692327184881; Thu, 17 Aug 2023 19:53:04 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Timothy McDaniel Subject: [PATCH 05/14] event/dlb2: remove word abort in comments Date: Thu, 17 Aug 2023 19:52:40 -0700 Message-Id: <20230818025249.33994-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130490 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 3C65A41B5F; Fri, 18 Aug 2023 04:53:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B084543274; Fri, 18 Aug 2023 04:53:10 +0200 (CEST) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mails.dpdk.org (Postfix) with ESMTP id A319843259 for ; Fri, 18 Aug 2023 04:53:06 +0200 (CEST) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-26d46664d00so119798a91.1 for ; Thu, 17 Aug 2023 19:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327185; x=1692931985; 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=UBBWbcnllzlu1REp47fthKPNoMAChuRXl8KZEw5m6EIF0dWJO03vr80JCH611zATxi 7HHP65B1Rb4UoPxSbvioJVn1ICLrmeVUUpVzAW3c7iWGQVPxYM0lqz0WYLGnCrKZvxoC lclVKu+wE3aGdEzL9AtuYREN3bPHlRTjXgSUsR6DkhUy60lOVGPBLLfeLHllNeUEVmZ/ zoYo6TijP9h1wKLWuJCPgf7EhmjB/KFLrkXzzOfwXccy6VkFQRo6aH1cEaN+lladlZz8 2yR2Eh3pyH0W7hhaUqELwZJ633IhlAjp6E4oQOTg6bXPbW6lAgxkpv8g4GujA+UNk/kA LOtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327185; x=1692931985; 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=FJ8Sz4OaDW2i8Cp4PbCmdjvweuP6SBDsjlIRJOREe1mFZyibTEpdcfV2t6OYNOAlHY MmMPIGjO8/Gk7+z75aweejYv2n6MAxhHyFgOVkjad1u8QGzsmMQn9Rl81pvVhEtnWPu/ /WViQXZZDUntP0lJk6vtVgOEBuhH6SauVUaFZ81Lj+ZaBORbuJkOl5XTXO3Ctk9C8kfz lzRLhH7+hN/dSJOxIl50KTGjju4bTEvl0VOchEbfaOMFPVHQDpZneaO1ABjxDDJC8olW ZuehHk8L6Pu1eb+7GIE/Pf4pq/dtmXNDZib1SwQL0LYw71gcgoecCYTVINtBAMsI655L HgwQ== X-Gm-Message-State: AOJu0YwGYvvHTTpxTT5u/GLO8WjAhelDIMwQMEbUsPgk+dvwSHoDWWsH dwEegfHpS0lMrX/aNU+L1winhDhoJHqU0CHkEvwNdg== X-Google-Smtp-Source: AGHT+IEvD1ayRTvsCdXJHsQHrVGwR+ZCf/QQzzI/moM7GdE6oTwi2+8/RzuG1voCzYz9+Okr4EirLw== X-Received: by 2002:a17:90b:19c3:b0:26d:4ade:e54b with SMTP id nm3-20020a17090b19c300b0026d4adee54bmr145213pjb.17.1692327185725; Thu, 17 Aug 2023 19:53:05 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:05 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad Subject: [PATCH 06/14] net/vdev_netvsc: replace use of term abort Date: Thu, 17 Aug 2023 19:52:41 -0700 Message-Id: <20230818025249.33994-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace 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 02:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130491 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 197F641B5F; Fri, 18 Aug 2023 04:53:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2EBE43279; Fri, 18 Aug 2023 04:53:11 +0200 (CEST) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 8980E4325F for ; Fri, 18 Aug 2023 04:53:07 +0200 (CEST) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-26934bc3059so1150320a91.1 for ; Thu, 17 Aug 2023 19:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327186; x=1692931986; 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=y9N/tetgHeyzAAJn+Z5yvt+aqCR5EDUvWNcvhP9si/s=; b=1qMQHVptbyCKgzdIztI94Dhscgyct5tKaLCOyV52idzIO9+YhBiKnuqhJmMbdM+cMu Fm1m+cJPO2ysNvtxKuW3tO+Xf5LtZPi4+ogtVXW3UTg+hRj34/tkkPAKjJbDZotx0pVy kNp7cOHK4Z5Ke+yYjgRAQcv2V+FXTNI9A+slgk5c1ZLOBy/emTxX5E8rE1ZvCwTBEGVr v+iZOh2qz21GhYc0V3Axz5uVaf9jZR5n0sjyX5LgYKqP8CcgCG3/SOA9xEY3BydP0QT7 6hzVp85spDGUQKDLCOs9lq5Hvt7obQcScuxw/QMyxDNPjWASfub56ZJ8VDev7yBhOgkG YLqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327186; x=1692931986; 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=y9N/tetgHeyzAAJn+Z5yvt+aqCR5EDUvWNcvhP9si/s=; b=l1O4PyD+LAAzDs6+kG+Um7LwlRFyaQPhkV9yy/lT6ElF0px5+WiwyXLaVehYSo4r4f Y4/sDFh0bZK9pRKNQnd5RGRMEYOd+t61jsZvG8oJ9z6vSETZmIPYZtFEzbTWI0F3SRXg t4zvBreSi5QQZof6Bb1ytyPI3ciAZRuKFcGJp05DVViXDkPHEbe1m07H6YwZhl2irLch 9SpaKlKyTu6XCrz3JP5Xb19de4EejYC7JO18oE294GS5dpJUEc8bmTkyLKacisms4jhr 2dP8Scyfc1dmgiBfFxxoomxu07cubPUPdWROdAMMrWaORfLd9Kabb98CUifSF09fAEv4 w5kQ== X-Gm-Message-State: AOJu0YzyHJTFtL+5hAT8OPltNvNPRPLFwYmyVZ9JnMSBPnme3HiVJSN+ fahczgk3hBpVFQ65DIu3mJeLzkbhzawOqW7iMsMjNA== X-Google-Smtp-Source: AGHT+IHJ0+b2fH51xpin2MD6XGd8BM5f5dK/gokcTKLp4AlzSitze90jmxh/C1opY/RBzlSbObgxBg== X-Received: by 2002:a17:90a:7289:b0:268:4498:ad68 with SMTP id e9-20020a17090a728900b002684498ad68mr5759644pjg.19.1692327186530; Thu, 17 Aug 2023 19:53:06 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Long Li Subject: [PATCH 07/14] net/netvsc: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:42 -0700 Message-Id: <20230818025249.33994-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Signed-off-by: Stephen Hemminger --- 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 02:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130492 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 9358F41B5F; Fri, 18 Aug 2023 04:53:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A23B4327C; Fri, 18 Aug 2023 04:53:13 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 762434326C for ; Fri, 18 Aug 2023 04:53:08 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26d46664d00so119804a91.1 for ; Thu, 17 Aug 2023 19:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327187; x=1692931987; 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=pCD1Zj+nbgJrWJcHon99U8VtIcXMH5Il7se49w384yHVIYM8Ss9Mfy1BGXiugHvg7X ds5/54BDvhZW6g0mNJt1UHbID28/jfJCGOPJ4EF58+mRQ3NspRz28OiT4iU7TCvYX8WS cOqkByJzSz6NSnKev5W6lhrewGjrKyG2Rpt+fxLGZ+CUwC1dmQ5jMNcvJ1pDaIVYnU42 9VmpYzs4jF884VhZAU6N1xtpETPnHd1LllKnXW+s147QKwRpz5lyome0TAoexkCuaU/H KLREM9FNA94dc4Y+KSGzDDlfA6vEqS2/B0CqVpNL1y7mhUcJxzDhYPskd7EfxwBaVtFA 4fDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327187; x=1692931987; 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=ALzZY2MlvLI2nWt4xgxoiZnIPWMWMtnjb+9Q4kfYQFx0hD//YVRUBpagL6fBwDNH2f 1LLfd4PtSgmWM0rY8mhFCEqxUI2siC3C95hum2yeHSmWKaYTMgBxqAK0WoJuuA4dMn+p hpBwtf3Sjs5qIjKSYLRYiiQCXGK582SUI2O4wDPzHBtdn3uqn+Sthk5/8AE2gLff2Eby 41P8FJ2kcQlVRtYEz3nAEsxyci/VnGtqoNON5wKhrjTs1wE0R5o3fk4XHOBiUQHefVcx XXlXq+D/FgOE09eM4t/9qeVqXNmfMPvtq3/6Tsd+y3zTc5YMgjznQqdD/CqUFNWT3ojp W/Yw== X-Gm-Message-State: AOJu0Ywkfb9xfcOBkh3gWNab67pOqGgaiSTuuGJgqGkEa8hXl+cd4VP9 Fo0PyFFufws5fWFf2DF4M8Y57FahBwFc4tQO2mI3gg== X-Google-Smtp-Source: AGHT+IHyOxlwaqFdQ7uHaAGQTIIMO4ji9Y2OfB28YRahrudvETapqQOUhWcjACjGO/LyudxQLoU8Sg== X-Received: by 2002:a17:90a:d902:b0:269:1860:c3bd with SMTP id c2-20020a17090ad90200b002691860c3bdmr1189868pjv.19.1692327187418; Thu, 17 Aug 2023 19:53:07 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Boyer Subject: [PATCH 08/14] net/ionic: remove word aborting Date: Thu, 17 Aug 2023 19:52:43 -0700 Message-Id: <20230818025249.33994-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130493 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 1B12941B5F; Fri, 18 Aug 2023 04:53:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5276A43281; Fri, 18 Aug 2023 04:53:14 +0200 (CEST) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mails.dpdk.org (Postfix) with ESMTP id 69EEA4326E for ; Fri, 18 Aug 2023 04:53:09 +0200 (CEST) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-26d1e5f2c35so347601a91.2 for ; Thu, 17 Aug 2023 19:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327188; x=1692931988; 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=AvLIKgbbuxVVKPnrY9yVji6LCe20zW3La7T4WrTLh/VQD/rAZ72gvZLhu0/jQosZrs 7OYaRcWpw02AHE6PwNGO0W+2lrlE94HEqGjV02goIKeDVNWjt4sFNIfpSYSYef12rPJq wZEG/q7EVrJuwICM3lDFWQk7xjA19kAYTxudSMWF6jD9stbvqFfv6YEdUHtXYZaxbv3V pcXaFdAsEvVMZAhsObYFz+afRmFJlFq0V0JUZoQViuRzOkRHeUFZmEDAK6egxuGT1qxc qsDeX4FYAx+uzlF66Q5cYPKGfS6abWTSFyBFV87y/jWihdDbLEjb8iL8C9S71iDAyYOC K55Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327188; x=1692931988; 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=Pb6nIGV/rXIWIlwtikkrnGr7+ik13uON3r2Ma8/7HXlGqqC0IyjY5I7FJRrUXl34CI N5s41XTZNjKHEsZceKc+/3w4Zr5SuC9SFIdNsROSDTuupShb7H5BMY6WPbSDmw8lEO0P z98MWW6dcARhewsJCeCgXwPWk+HtC5M3PcuTVZZzvgRt6pc4r4YGJZKaMKxoo0aFhrLa 22HyCHjkt/vR03GwLtNhVI4aGnhRfxF1aeM+GFkx/DI8inAXHRJht8DZT0nV8xm1FPX0 8SJjtyC+6t4K0vqEayAA76QeoVHkbxv3l748EOCpTNRiku4lQ53bnORpWLdf01tU7Csk SbDg== X-Gm-Message-State: AOJu0YzXy/FV15RSrjxx3yaZp36ZR3rYKGyqeqhwrztWE3qF7ohjsGdu Ffpy7U0y9eNdSwUBvgH9QAgH8e4zTyKs1z3TRAGt3A== X-Google-Smtp-Source: AGHT+IEsn2fkBDAE1MhwVigbDMOf4BCTBRC+c7l2RAzAmqlHFjnAXNU0Vo1AmsNlXT8nx2zGHRRy4g== X-Received: by 2002:a17:90b:1d09:b0:262:fe45:860b with SMTP id on9-20020a17090b1d0900b00262fe45860bmr1292003pjb.0.1692327188292; Thu, 17 Aug 2023 19:53:08 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Julien Aube Subject: [PATCH 09/14] net/bnx2x: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:44 -0700 Message-Id: <20230818025249.33994-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130494 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3DE641B5F; Fri, 18 Aug 2023 04:54:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AB5243286; Fri, 18 Aug 2023 04:53:15 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id D610243276 for ; Fri, 18 Aug 2023 04:53:10 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26b4a9205e3so319897a91.0 for ; Thu, 17 Aug 2023 19:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=; b=ox2/jIGG8AqJ9ueTfPhLiAJV+Bk6YvYlAyM0SUShmOvWAfYdyI6zgXRYUKwgqskHA5 FAMp7yco1XOP1ErPW6hbJ2QJt2g1hBvziPRVSN/1w2bxzFcgXbZTV7jTZRRTQoH+BitI 8kEQitid9Dcgifg7iP/ryYyH0XF6dmGWce9pKyK8TTjZPvYKFQv5BQ9kPg2ynfGcOY2W rDar6a6Hk7w13lPFoIlFWtVJ32qPVC8GwApxdXyk0QeVdwKJGfJxrF8/jblDLR0xTLIT viSkSY2cw5tCsOGkdegj95057u/jqiO+SFInAA0l0t6trL3YvRH26hb2uxI+OmsyfIiq Mn9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4IzGFYWOY7KOJz0MYgo0/yAYVS6usUa5wUCpyaIq0fc=; b=LZeAxHQ2x+xQZ1soE+9aSIzIpESe+9NJFr0szsU3X5U6SnbzPqLgL1tIWvSeub7+jN ZS9fQEvlLCkg37L513u/nnFUqeoY7jhSI+csWPUaTpBAYvIyc8rPpNSZzzAtg3OAa/1e TKiTyEIm+hvx4xOS0Isuf5At0C5sWiNtoLP0B4aW3QqLcadeE8vWUjqlZDxnnY2fXs2j aFlgp2aZBXym3gOH/MVus+KR1o9GNIQ7swBRxb2yUDV2aUL38EvsluF/772iL27tDxh6 Sh/B6+nXGZVOeGCoAKb6hWc+4Ljc+luCsGY+6U26CgOxp0z+OyxiY6QAG0d+oO1O+LQ5 Httg== X-Gm-Message-State: AOJu0YyD3Mq1iqehM3vVr491RwZ12gJ7Xr28HaMI3ykRX2A7cSpMD5hF X8pMcUjWZjNoExra2QcpNxlGXpKJp5WSyIrUXxF3sg== X-Google-Smtp-Source: AGHT+IGRypLR6cEZdh9GjvCo5JDTVB2OMpyJzXO+fw3KG33D0GONYg7CxsFPJ1gAAAm1Vfw8AcHN7A== X-Received: by 2002:a17:90a:1b41:b0:26b:7354:f009 with SMTP id q59-20020a17090a1b4100b0026b7354f009mr1199222pjq.43.1692327189276; Thu, 17 Aug 2023 19:53:09 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH 10/14] net/mlx5: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:45 -0700 Message-Id: <20230818025249.33994-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace use of term abort with cancel in mlx5 common and driver code. Signed-off-by: Stephen Hemminger --- drivers/common/mlx5/mlx5_common_mr.c | 6 +++--- drivers/common/mlx5/mlx5_prm.h | 4 ++-- drivers/net/mlx5/hws/mlx5dr_rule.c | 8 ++++---- drivers/net/mlx5/hws/mlx5dr_send.c | 2 +- drivers/net/mlx5/hws/mlx5dr_send.h | 2 +- drivers/net/mlx5/linux/mlx5_os.c | 4 ++-- drivers/net/mlx5/mlx5_rx.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 40ff9153bd8e..b383ee31683c 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -179,7 +179,7 @@ mr_btree_insert(struct mlx5_mr_btree *bt, struct mr_cache_entry *entry) /* Find out the slot for insertion. */ if (mr_btree_lookup(bt, &idx, entry->start) != UINT32_MAX) { DRV_LOG(DEBUG, - "abort insertion to B-tree(%p): already exist at" + "insertion to B-tree(%p): already exist at" " idx=%u [0x%" PRIxPTR ", 0x%" PRIxPTR ") lkey=0x%x", (void *)bt, idx, entry->start, entry->end, entry->lkey); /* Already exist, return. */ @@ -824,7 +824,7 @@ mlx5_mr_create_primary(void *pd, rte_rwlock_write_lock(&share_cache->rwlock); /* * Check the address is really missing. If other thread already created - * one or it is not found due to overflow, abort and return. + * one or it is not found due to overflow, cancel and return. */ if (mlx5_mr_lookup_cache(share_cache, entry, addr) != UINT32_MAX) { /* @@ -833,7 +833,7 @@ mlx5_mr_create_primary(void *pd, * here again. */ mr_btree_insert(&share_cache->cache, entry); - DRV_LOG(DEBUG, "Found MR for %p on final lookup, abort", + DRV_LOG(DEBUG, "Found MR for %p on final lookup ", (void *)addr); rte_rwlock_write_unlock(&share_cache->rwlock); rte_mcfg_mem_read_unlock(); diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 51f426c61408..fa17b8af1846 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -192,7 +192,7 @@ /* Tunnel packet bit in the CQE. */ #define MLX5_CQE_RX_TUNNEL_PACKET (1u << 0) -/* Mask for LRO push flag in the CQE lro_tcppsh_abort_dupack field. */ +/* Mask for LRO push flag in the CQE lro_tcppsh_dupack field. */ #define MLX5_CQE_LRO_PUSH_MASK 0x40 /* Mask for L4 type in the CQE hdr_type_etc field. */ @@ -423,7 +423,7 @@ struct mlx5_cqe { uint8_t pkt_info; uint8_t rsvd0; uint16_t wqe_id; - uint8_t lro_tcppsh_abort_dupack; + uint8_t lro_tcppsh_dupack; uint8_t lro_min_ttl; uint16_t lro_tcp_win; uint32_t lro_ack_seq_num; diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c index 931c68b1606d..70a779a7558b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_rule.c +++ b/drivers/net/mlx5/hws/mlx5dr_rule.c @@ -391,7 +391,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule, mlx5dr_rule_create_init(rule, &ste_attr, &apply, is_update); /* Allocate dependent match WQE since rule might have dependent writes. - * The queued dependent WQE can be later aborted or kept as a dependency. + * The queued dependent WQE can be later canceled or kept as a dependency. * dep_wqe buffers (ctrl, data) are also reused for all STE writes. */ dep_wqe = mlx5dr_send_add_new_dep_wqe(queue); @@ -413,7 +413,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule, ret = mlx5dr_rule_alloc_action_ste(rule, attr); if (ret) { DR_LOG(ERR, "Failed to allocate action memory %d", ret); - mlx5dr_send_abort_new_dep_wqe(queue); + mlx5dr_send_cancel_new_dep_wqe(queue); return ret; } /* Skip RX/TX based on the dep_wqe init */ @@ -445,8 +445,8 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule, if (action_stes || apply.require_dep) break; - /* Rule has no dependencies, abort dep_wqe and send WQE now */ - mlx5dr_send_abort_new_dep_wqe(queue); + /* Rule has no dependencies, cancel dep_wqe and send WQE now */ + mlx5dr_send_cancel_new_dep_wqe(queue); ste_attr.wqe_tag_is_jumbo = is_jumbo; ste_attr.send_attr.notify_hw = !attr->burst; ste_attr.send_attr.user_data = dep_wqe->user_data; diff --git a/drivers/net/mlx5/hws/mlx5dr_send.c b/drivers/net/mlx5/hws/mlx5dr_send.c index e58fdeb117f7..7c6ff3f5c75b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_send.c +++ b/drivers/net/mlx5/hws/mlx5dr_send.c @@ -15,7 +15,7 @@ mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue) return &send_sq->dep_wqe[idx]; } -void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue) +void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue) { queue->send_ring->send_sq.head_dep_idx--; } diff --git a/drivers/net/mlx5/hws/mlx5dr_send.h b/drivers/net/mlx5/hws/mlx5dr_send.h index c1e8616f7e35..02ecf865ad6a 100644 --- a/drivers/net/mlx5/hws/mlx5dr_send.h +++ b/drivers/net/mlx5/hws/mlx5dr_send.h @@ -220,7 +220,7 @@ mlx5dr_uar_write64_relaxed(uint64_t val, void *addr) struct mlx5dr_send_ring_dep_wqe * mlx5dr_send_add_new_dep_wqe(struct mlx5dr_send_engine *queue); -void mlx5dr_send_abort_new_dep_wqe(struct mlx5dr_send_engine *queue); +void mlx5dr_send_cancel_new_dep_wqe(struct mlx5dr_send_engine *queue); void mlx5dr_send_all_dep_wqe(struct mlx5dr_send_engine *queue); diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index d8f1adfe3df0..26aed417724c 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2384,7 +2384,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, } if (i != ns) { DRV_LOG(ERR, - "probe of PCI device " PCI_PRI_FMT " aborted after" + "probe of PCI device " PCI_PRI_FMT " canceled after" " encountering an error: %s", owner_pci.domain, owner_pci.bus, owner_pci.devid, owner_pci.function, @@ -2484,7 +2484,7 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev, eth_da.ports[p], mkvlist); if (ret) { DRV_LOG(INFO, "Probe of PCI device " PCI_PRI_FMT " " - "aborted due to proding failure of PF %u", + "canceled due to proding failure of PF %u", pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function, eth_da.ports[p]); diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c index 392784050f57..ceafa95555de 100644 --- a/drivers/net/mlx5/mlx5_rx.c +++ b/drivers/net/mlx5/mlx5_rx.c @@ -1085,7 +1085,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, tcp->recv_ack = cqe->lro_ack_seq_num; tcp->rx_win = cqe->lro_tcp_win; } - if (cqe->lro_tcppsh_abort_dupack & MLX5_CQE_LRO_PUSH_MASK) + if (cqe->lro_tcppsh_cancel_dupack & MLX5_CQE_LRO_PUSH_MASK) tcp->tcp_flags |= RTE_TCP_PSH_FLAG; tcp->cksum = 0; csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4); From patchwork Fri Aug 18 02:52:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130495 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 CFFE441B5F; Fri, 18 Aug 2023 04:54:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4D2E43288; Fri, 18 Aug 2023 04:53:16 +0200 (CEST) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mails.dpdk.org (Postfix) with ESMTP id 33E8E43276 for ; Fri, 18 Aug 2023 04:53:11 +0200 (CEST) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-26814e27a9eso332560a91.0 for ; Thu, 17 Aug 2023 19:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=FAxZzF0ZneUcZpce3/Kh9lVXJ6ECDGiRRp3IOeVO5crZTEwMsFajN+mZ7JW+m+8Tfr 2vhnPAEKBdjWV0UHfg1Pj7tLvmrNnfN2rztpXIGAQgDw4eAVlW5F7pVHgiZ7fUE5yA2D lnu2OW3+HrGnWeDgBEtuZaRis1CVa7Qj+JyUpft6pZQS6aceMkkRnsr1bFlUdzRXpEh2 xnm45Le4NEjGv+C8hMX4Sm0tNxCYqjh2vjdLam7c1mK8ukmSn+KeXI+5VTBt8FpSR0GI zDAaoJB5uM2lFCQB15uxQz93Rw/U5qOX9HIjf7pUTASj5YH3UqxjQoLyotamV3uBJs6K ojMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327190; x=1692931990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fREpg+5p1kGXcqExd41cgj50m998TkQbF0biOt69Io4=; b=aVi+1ZcxbmeTqiLkpDMr5di6A/4+EFysgZ5PdcN7/0Qr92UYxxghdzluB7uytNfgWy GpORXuz8p8jyC5ihm2z4LQ+bO39qRpk0JkK0wCc1AOVrGzqp+UDiV8kGkHG8Eg/9uWWY 6a6LIOiZlRDEseGTt1qWIJAiqLxtRopEQj+bY8ZGqOzDWfKwrYrCCNVZg4bnqhBBkmcj OmLPA2OW4MmZyavPpzQmlAfrfKuIyHMHFBi3gQu6hhSRiiGfb0kST7o9jGAQrbrWIIVJ 8wC5RdPGwQHBUwJZVjuFcSp76IA3wSdNuPcZyJ38forYMxDmVbad3LhkhDY/gqr6F+LP Nq3Q== X-Gm-Message-State: AOJu0Yz5++dkDukKhcZfG9LsReDrpGM/R7walvp8LWIXzX0Xg+PpSF68 8ZJFR6x8v5Fb57LGL3WRBpqzTMbzss+FmCebLhP4Sg== X-Google-Smtp-Source: AGHT+IGeqfXWprj+nZME+RwVCadQkMvOcLS7LdTfmXoaFpcOTpeyMO+9ljqmTVYQ0RF0blcXjxrYxg== X-Received: by 2002:a17:90a:73c7:b0:262:ece1:5fd0 with SMTP id n7-20020a17090a73c700b00262ece15fd0mr1156328pjk.12.1692327190083; Thu, 17 Aug 2023 19:53:10 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH 11/14] net/softnic: replace abort with cancel Date: Thu, 17 Aug 2023 19:52:46 -0700 Message-Id: <20230818025249.33994-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130496 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 D61EA41B5F; Fri, 18 Aug 2023 04:54:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B951E4328E; Fri, 18 Aug 2023 04:53:17 +0200 (CEST) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 1398C4327B for ; Fri, 18 Aug 2023 04:53:12 +0200 (CEST) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-269304c135aso346717a91.3 for ; Thu, 17 Aug 2023 19:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327191; x=1692931991; 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=BI9uBTIM7Q1PbZcPVbcVbY5+bQ1mMJeyZmCVHk0GDZPa83UxQC6uiGhndsTq9W/DU9 /NBSi5tt+rht0rcoCPEC1ifhfpBQwseMmroyZY96d3edtFq+9nR7a7dsPbPdWUzaKXZp nsuR/Y6PH1Y/BsBMHoZPDn+BYZh4M9E5N6ix7edp8V4h/9Q3XhWCD1r/cNSV2xjJmE47 9oKy1oQSBXv2EaG4+Pg/FcHVCq+r9IJmtNGhyBTqOaAxShvU+fok/yy8tjVMpRsCgwWC eyLbg/1gKg9mDZwen+P7WSuWZs7JXdZwoRBg6JJI/nRaXoBTQxKH2MIATAJPZFENYRwn JLbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327191; x=1692931991; 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=PhMr0CHF6HkhRi9hMhOTSKeotL/Cji07BLeW1WqPN6cVYXuR16Hvtxb1FZ4KN2/pXi 3ewi3TD/ps+ydyHjRNJzZRu4/9mYrcyzKR7v+MS4OsswEcKBfXfthuwuiyYawHJipE7P Y+yKcBSVNWWkHKJBpNhQMvgtfqKSg0JXgvx8mxLHuKJP4HHyiFXfsZD3I3U8em7JDM/H Zz729lZktS069nsmHXXaEVUBkr3M1N6RjgpoeVLmE3VXaRXuGu1Aa6OPSHDS36XNlAA6 uYHAot3t/bWZRrjF6xXN+ecaDityNpM4ZJx8KCDQEg3TKmoWmIi+0Mg83HYUJvz6CM1D P+Ig== X-Gm-Message-State: AOJu0Yzoh9bAHxcZT198g0uvYqD1Si2HOrcYjSTEmcg3rW5+zDUiK00P MO0VZ/7g0Iszl2UhLfJ8vxbPLysFdqh6l6PPAGvrWA== X-Google-Smtp-Source: AGHT+IHSqEOvF709vv+QDTyVG4jYaJ2UxPzmPBgm/mzGMHXfNy9dTOfOAiX2SCdVkV8R5FXtZefudg== X-Received: by 2002:a17:90a:ce09:b0:26d:4312:1896 with SMTP id f9-20020a17090ace0900b0026d43121896mr765522pju.20.1692327191064; Thu, 17 Aug 2023 19:53:11 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 12/14] net/mlx4: remove word abort Date: Thu, 17 Aug 2023 19:52:47 -0700 Message-Id: <20230818025249.33994-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 02:52:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130497 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 D86F243000; Fri, 18 Aug 2023 04:54:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C96A943292; Fri, 18 Aug 2023 04:53:18 +0200 (CEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by mails.dpdk.org (Postfix) with ESMTP id EC4E843269 for ; Fri, 18 Aug 2023 04:53:12 +0200 (CEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6bcf2fd5d69so457850a34.1 for ; Thu, 17 Aug 2023 19:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327192; x=1692931992; 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=ii7Zacc2ry9jmVYtf2MxUxpA+hYrcnoG3+tVB/b+8u8=; b=OMJVPataYa3PTqrTqcAidy0l6cuvMjZnG7/FjaA1nmGQRPsZJJ1xJ2ArYT0Hyp0fmQ EzjnvfklnFZX/qJGorC+fDcT2FBtuRvA3KOF4/15lzS2qBg0wnnLqP1a5JLiNN00Fe7C bAjwMH88xSL09DQyS2OYtcYysimlY07/Rp7vG+lMVIADArGe1UJtDqM6z2TiiowgcEe3 V7gFsI9J/IxK6BEsf9WLRbnFJXSIka1CNkpwhOSJMAiBOX/EF0qM77LHm5O/NbpfFHNn ljQDl0ObGtb2k0k4UkW1TkYLo3gDV2eJ5zMuYPUeDazJbr0RIJJGLie9BSJWuSdXFCRm uyIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327192; x=1692931992; 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=ii7Zacc2ry9jmVYtf2MxUxpA+hYrcnoG3+tVB/b+8u8=; b=D+JcDfVB8oZHyflu6m3TpIP27Vw+Rp7OWFimQ5Nqaoc+yoy3gjg766MJLeg/D+ueK4 QWVuN7PjY94MF/h2RCP6SIu5z4IuhZbbX1AWIdegUPCBngrnqSy2jiLmeDhOnXd6HzJM i0fmt0AWhlrS6AXhP7qO+UcxYOoNyaM+SHKQZzvrgnbbCE1uOb9C1t1iOH1WUnoI2Sq4 2XUexeJJjv14KObw+8DmuyDKLjJAAKNGTAd/PAtflJ0srpvzE6UwMLZMWKSN3dlKhVk5 yHn9K5ang0JkUiqcVToKb73JbGKJeTBriMt3vg8B3RkBLFmLXdahXwGQzc9DIY4Ice2s Srig== X-Gm-Message-State: AOJu0YwYAJPNic6IlgnYr5rTFQToJO45M8GbDaZB4cpXL9hKI7XXjkKU EJ1ocTySvEjQMaOGpztLtP6xIZ1wGRqiZ8PrewkZ8g== X-Google-Smtp-Source: AGHT+IGx7Ewr4UA3hT34RUEK55DuDn3BivCJJaZ/wICrOd3NctG7U7ZQlD4c8SWqwDj39BWkXBxEYA== X-Received: by 2002:a05:6871:5ca:b0:1bf:d869:cd97 with SMTP id v10-20020a05687105ca00b001bfd869cd97mr1434041oan.29.1692327192038; Thu, 17 Aug 2023 19:53:12 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Subject: [PATCH 13/14] sfc: remove use of term abort Date: Thu, 17 Aug 2023 19:52:48 -0700 Message-Id: <20230818025249.33994-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace abort with cancel. Signed-off-by: Stephen Hemminger --- drivers/common/sfc_efx/efsys.h | 2 +- drivers/common/sfc_efx/sfc_efx_mcdi.c | 6 +++--- drivers/common/sfc_efx/version.map | 2 +- drivers/net/sfc/sfc_ef10_rx.c | 2 +- drivers/net/sfc/sfc_ev.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h index 41fa3da76229..098e805daa26 100644 --- a/drivers/common/sfc_efx/efsys.h +++ b/drivers/common/sfc_efx/efsys.h @@ -548,7 +548,7 @@ typedef struct efsys_bar_s { * (required by PIO hardware). * * Neither VFIO, nor UIO, nor NIC UIO (on FreeBSD) support - * write-combined memory mapped to user-land, so just abort if used. + * write-combined memory mapped to user-land, so just cancel if used. */ #define EFSYS_BAR_WC_WRITEQ(_esbp, _offset, _eqp) \ do { \ diff --git a/drivers/common/sfc_efx/sfc_efx_mcdi.c b/drivers/common/sfc_efx/sfc_efx_mcdi.c index 0d17616589bb..e1ba70945474 100644 --- a/drivers/common/sfc_efx/sfc_efx_mcdi.c +++ b/drivers/common/sfc_efx/sfc_efx_mcdi.c @@ -76,7 +76,7 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy) efx_nic_t *enp; unsigned int delay_total; unsigned int delay_us; - boolean_t aborted __rte_unused; + boolean_t canceled __rte_unused; delay_total = 0; delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US; @@ -93,8 +93,8 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy) if (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) { if (!proxy) { - aborted = efx_mcdi_request_abort(enp); - SFC_EFX_ASSERT(aborted); + canceled = efx_mcdi_request_cancel(enp); + SFC_EFX_ASSERT(canceled); sfc_efx_mcdi_timeout(mcdi); } diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map index 40c97ad2b483..4f8f96e7b74b 100644 --- a/drivers/common/sfc_efx/version.map +++ b/drivers/common/sfc_efx/version.map @@ -165,7 +165,7 @@ INTERNAL { efx_mcdi_mport_alloc_alias; efx_mcdi_new_epoch; efx_mcdi_reboot; - efx_mcdi_request_abort; + efx_mcdi_request_cancel; efx_mcdi_request_poll; efx_mcdi_request_start; diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c index 30a320d0791c..a8676d064618 100644 --- a/drivers/net/sfc/sfc_ef10_rx.c +++ b/drivers/net/sfc/sfc_ef10_rx.c @@ -265,7 +265,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, EFX_MASK32(ESF_DZ_RX_DSC_PTR_LBITS); if (ready == 0) { - /* Rx abort - it was no enough descriptors for Rx packet */ + /* Rx cancel - it was no enough descriptors for Rx packet */ rte_pktmbuf_free(rxq->scatter_pkt); rxq->scatter_pkt = NULL; return rx_pkts; diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index c0d58c9554ce..678c76acef50 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -104,13 +104,13 @@ sfc_ev_efx_rx(void *arg, __rte_unused uint32_t label, uint32_t id, if (delta == 0) { /* * Rx event with no new descriptors done and zero length - * is used to abort scattered packet when there is no room + * is used to cancel scattered packet when there is no room * for the tail. */ if (unlikely(size != 0)) { evq->exception = B_TRUE; sfc_err(evq->sa, - "EVQ %u RxQ %u invalid RX abort " + "EVQ %u RxQ %u invalid RX cancel " "(id=%#x size=%u flags=%#x); needs restart", evq->evq_index, rxq->dp.dpq.queue_id, id, size, flags); From patchwork Fri Aug 18 02:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130498 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 B9DA343000; Fri, 18 Aug 2023 04:54:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC29B43296; Fri, 18 Aug 2023 04:53:19 +0200 (CEST) Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by mails.dpdk.org (Postfix) with ESMTP id BAC7D43269 for ; Fri, 18 Aug 2023 04:53:13 +0200 (CEST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1bff2d2c141so252302fac.1 for ; Thu, 17 Aug 2023 19:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327193; x=1692931993; 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=x/059GDUMZciHxXtI9wy1aP3TtCpWPihifdPrlDKe9Hf6h2/q0jI83xHCGc1oOyeMr hCsdCHHyqpuqSlEPiUHJYAmBuS9dS7QIw9OhDzDAthEAhLvkady6gGacOQSqrW7pZc/K bn8vp4PlxKXsRPaigHh1b+2VPBrTnnYL/xQXc6EMItah+aiG01ZbojUFheirQcosi9Nj +U3jAYxT098mG4PSRoAUHYCHV2Zhqu9Q1KXUk0kQyquZxuL7lJbMlwnUv5ZnR2d6HZ1i hmTXLbthWguNOMqb5h7hEATTKfsXQKFoek7SyAK0KVNAmBK88BY6dLABpVEBeKbZOd/H 1sGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692327193; x=1692931993; 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=JIyd968Z6FHRzuCgpFJaffc9s+wCiE7uutj5WPZMX64aLLq3zruHEfr84GybwzLpNs nrcB26DVZ8/niRE2keuV9P3SB5x+7LonR+//8PYemW0Yx+roZshaIqj1kSxzfK/MgV9v W1f/hWlhwAG7NkaXRIt7v1p07HNLG1XZuCUKV3t4PEbRalZw/xCMJ4uRsn7sv3NVpBnr yqjE1F7V2H60cFQgkl0PQs/+M12mec3C+KIPiAGmJj3Cut0dTknUQva8x9njh8T4my85 flHKGjaFEHRMhn7+UMIbYvB3ppr8DF2rtb1HR9w0vjADcO7/ImkaPNE0HIgGHBifzUMK h0+Q== X-Gm-Message-State: AOJu0Yw+AUWDj8PslaUczXSO6v9D48dyIU7c/tj6FykCvsw3Bpf9EpSY /3rhuAXHRwWSTkPuj8NwLRBW1AAl0CcmZK2YuRtlRg== X-Google-Smtp-Source: AGHT+IGpza9ks/iQD5YJCh2gATbMM59VFFpn83T51mdOe5zy2eEBJNbAFFrzM9TWNiuxhshMYXxomQ== X-Received: by 2002:a05:6870:73c6:b0:1be:e925:3dce with SMTP id a6-20020a05687073c600b001bee9253dcemr1501814oan.7.1692327192865; Thu, 17 Aug 2023 19:53:12 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 19:53:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chandubabu Namburu Subject: [PATCH 14/14] net/axgbe: replace word abort Date: Thu, 17 Aug 2023 19:52:49 -0700 Message-Id: <20230818025249.33994-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818025249.33994-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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; }