Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130497/?format=api
http://patchwork.dpdk.org/api/patches/130497/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230818025249.33994-14-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230818025249.33994-14-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230818025249.33994-14-stephen@networkplumber.org", "date": "2023-08-18T02:52:48", "name": "[13/14] sfc: remove use of term abort", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9c2c7ba698d2e496af32151a288ed4ab90ab59b7", "submitter": { "id": 27, "url": "http://patchwork.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230818025249.33994-14-stephen@networkplumber.org/mbox/", "series": [ { "id": 29271, "url": "http://patchwork.dpdk.org/api/series/29271/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29271", "date": "2023-08-18T02:52:35", "name": "remove use of term abort", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29271/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/130497/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130497/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D86F243000;\n\tFri, 18 Aug 2023 04:54:18 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C96A943292;\n\tFri, 18 Aug 2023 04:53:18 +0200 (CEST)", "from mail-ot1-f48.google.com (mail-ot1-f48.google.com\n [209.85.210.48]) by mails.dpdk.org (Postfix) with ESMTP id EC4E843269\n for <dev@dpdk.org>; Fri, 18 Aug 2023 04:53:12 +0200 (CEST)", "by mail-ot1-f48.google.com with SMTP id\n 46e09a7af769-6bcf2fd5d69so457850a34.1\n for <dev@dpdk.org>; Thu, 17 Aug 2023 19:53:12 -0700 (PDT)", "from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207])\n by smtp.gmail.com with ESMTPSA id\n ep13-20020a17090ae64d00b00262e485156esm2221246pjb.57.2023.08.17.19.53.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 17 Aug 2023 19:53:11 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692327192;\n x=1692931992;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=ii7Zacc2ry9jmVYtf2MxUxpA+hYrcnoG3+tVB/b+8u8=;\n b=OMJVPataYa3PTqrTqcAidy0l6cuvMjZnG7/FjaA1nmGQRPsZJJ1xJ2ArYT0Hyp0fmQ\n EzjnvfklnFZX/qJGorC+fDcT2FBtuRvA3KOF4/15lzS2qBg0wnnLqP1a5JLiNN00Fe7C\n bAjwMH88xSL09DQyS2OYtcYysimlY07/Rp7vG+lMVIADArGe1UJtDqM6z2TiiowgcEe3\n V7gFsI9J/IxK6BEsf9WLRbnFJXSIka1CNkpwhOSJMAiBOX/EF0qM77LHm5O/NbpfFHNn\n ljQDl0ObGtb2k0k4UkW1TkYLo3gDV2eJ5zMuYPUeDazJbr0RIJJGLie9BSJWuSdXFCRm\n uyIA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1692327192; x=1692931992;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=ii7Zacc2ry9jmVYtf2MxUxpA+hYrcnoG3+tVB/b+8u8=;\n b=D+JcDfVB8oZHyflu6m3TpIP27Vw+Rp7OWFimQ5Nqaoc+yoy3gjg766MJLeg/D+ueK4\n QWVuN7PjY94MF/h2RCP6SIu5z4IuhZbbX1AWIdegUPCBngrnqSy2jiLmeDhOnXd6HzJM\n i0fmt0AWhlrS6AXhP7qO+UcxYOoNyaM+SHKQZzvrgnbbCE1uOb9C1t1iOH1WUnoI2Sq4\n 2XUexeJJjv14KObw+8DmuyDKLjJAAKNGTAd/PAtflJ0srpvzE6UwMLZMWKSN3dlKhVk5\n yHn9K5ang0JkUiqcVToKb73JbGKJeTBriMt3vg8B3RkBLFmLXdahXwGQzc9DIY4Ice2s\n Srig==", "X-Gm-Message-State": "AOJu0YwYAJPNic6IlgnYr5rTFQToJO45M8GbDaZB4cpXL9hKI7XXjkKU\n EJ1ocTySvEjQMaOGpztLtP6xIZ1wGRqiZ8PrewkZ8g==", "X-Google-Smtp-Source": "\n AGHT+IGx7Ewr4UA3hT34RUEK55DuDn3BivCJJaZ/wICrOd3NctG7U7ZQlD4c8SWqwDj39BWkXBxEYA==", "X-Received": "by 2002:a05:6871:5ca:b0:1bf:d869:cd97 with SMTP id\n v10-20020a05687105ca00b001bfd869cd97mr1434041oan.29.1692327192038;\n Thu, 17 Aug 2023 19:53:12 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "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", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Replace abort with cancel.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/common/sfc_efx/efsys.h | 2 +-\n drivers/common/sfc_efx/sfc_efx_mcdi.c | 6 +++---\n drivers/common/sfc_efx/version.map | 2 +-\n drivers/net/sfc/sfc_ef10_rx.c | 2 +-\n drivers/net/sfc/sfc_ev.c | 4 ++--\n 5 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h\nindex 41fa3da76229..098e805daa26 100644\n--- a/drivers/common/sfc_efx/efsys.h\n+++ b/drivers/common/sfc_efx/efsys.h\n@@ -548,7 +548,7 @@ typedef struct efsys_bar_s {\n * (required by PIO hardware).\n *\n * Neither VFIO, nor UIO, nor NIC UIO (on FreeBSD) support\n- * write-combined memory mapped to user-land, so just abort if used.\n+ * write-combined memory mapped to user-land, so just cancel if used.\n */\n #define EFSYS_BAR_WC_WRITEQ(_esbp, _offset, _eqp)\t\t\t\\\n \tdo {\t\t\t\t\t\t\t\t\\\ndiff --git a/drivers/common/sfc_efx/sfc_efx_mcdi.c b/drivers/common/sfc_efx/sfc_efx_mcdi.c\nindex 0d17616589bb..e1ba70945474 100644\n--- a/drivers/common/sfc_efx/sfc_efx_mcdi.c\n+++ b/drivers/common/sfc_efx/sfc_efx_mcdi.c\n@@ -76,7 +76,7 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)\n \tefx_nic_t *enp;\n \tunsigned int delay_total;\n \tunsigned int delay_us;\n-\tboolean_t aborted __rte_unused;\n+\tboolean_t canceled __rte_unused;\n \n \tdelay_total = 0;\n \tdelay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;\n@@ -93,8 +93,8 @@ sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)\n \n \t\tif (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) {\n \t\t\tif (!proxy) {\n-\t\t\t\taborted = efx_mcdi_request_abort(enp);\n-\t\t\t\tSFC_EFX_ASSERT(aborted);\n+\t\t\t\tcanceled = efx_mcdi_request_cancel(enp);\n+\t\t\t\tSFC_EFX_ASSERT(canceled);\n \t\t\t\tsfc_efx_mcdi_timeout(mcdi);\n \t\t\t}\n \ndiff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map\nindex 40c97ad2b483..4f8f96e7b74b 100644\n--- a/drivers/common/sfc_efx/version.map\n+++ b/drivers/common/sfc_efx/version.map\n@@ -165,7 +165,7 @@ INTERNAL {\n \tefx_mcdi_mport_alloc_alias;\n \tefx_mcdi_new_epoch;\n \tefx_mcdi_reboot;\n-\tefx_mcdi_request_abort;\n+\tefx_mcdi_request_cancel;\n \tefx_mcdi_request_poll;\n \tefx_mcdi_request_start;\n \ndiff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c\nindex 30a320d0791c..a8676d064618 100644\n--- a/drivers/net/sfc/sfc_ef10_rx.c\n+++ b/drivers/net/sfc/sfc_ef10_rx.c\n@@ -265,7 +265,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,\n \t\tEFX_MASK32(ESF_DZ_RX_DSC_PTR_LBITS);\n \n \tif (ready == 0) {\n-\t\t/* Rx abort - it was no enough descriptors for Rx packet */\n+\t\t/* Rx cancel - it was no enough descriptors for Rx packet */\n \t\trte_pktmbuf_free(rxq->scatter_pkt);\n \t\trxq->scatter_pkt = NULL;\n \t\treturn rx_pkts;\ndiff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c\nindex c0d58c9554ce..678c76acef50 100644\n--- a/drivers/net/sfc/sfc_ev.c\n+++ b/drivers/net/sfc/sfc_ev.c\n@@ -104,13 +104,13 @@ sfc_ev_efx_rx(void *arg, __rte_unused uint32_t label, uint32_t id,\n \tif (delta == 0) {\n \t\t/*\n \t\t * Rx event with no new descriptors done and zero length\n-\t\t * is used to abort scattered packet when there is no room\n+\t\t * is used to cancel scattered packet when there is no room\n \t\t * for the tail.\n \t\t */\n \t\tif (unlikely(size != 0)) {\n \t\t\tevq->exception = B_TRUE;\n \t\t\tsfc_err(evq->sa,\n-\t\t\t\t\"EVQ %u RxQ %u invalid RX abort \"\n+\t\t\t\t\"EVQ %u RxQ %u invalid RX cancel \"\n \t\t\t\t\"(id=%#x size=%u flags=%#x); needs restart\",\n \t\t\t\tevq->evq_index, rxq->dp.dpq.queue_id,\n \t\t\t\tid, size, flags);\n", "prefixes": [ "13/14" ] }{ "id": 130497, "url": "