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);