From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 63D624305F; Fri, 18 Aug 2023 06:04:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47C9740ED9; Fri, 18 Aug 2023 06:04:34 +0200 (CEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2050.outbound.protection.outlook.com [40.107.105.50]) by mails.dpdk.org (Postfix) with ESMTP id 5597B40395 for ; Fri, 18 Aug 2023 06:04:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TCmnQMfZkC7pkLT+CF39mk8Y4JYxW71qw2pYhw3fVuw=; b=a+jExE9G+0vofADLTo9bN78AHVdfAFnuJLoIq+8esNjWJL4U1yr5760KoEtCzRxCukDgMzpfOZHopKw0Ze3K0yW1QbinRgPd/j1tSiGQbrddcZPR8rtmbQsLE0AmH9y3poMaA+DTVHJ277PfQ/NBhgi0cqVBGKYtQY6bgX7FKVQ= Received: from AS9PR06CA0671.eurprd06.prod.outlook.com (2603:10a6:20b:49c::15) by AS2PR08MB9787.eurprd08.prod.outlook.com (2603:10a6:20b:604::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.31; Fri, 18 Aug 2023 04:04:29 +0000 Received: from AM7EUR03FT051.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:49c:cafe::ca) by AS9PR06CA0671.outlook.office365.com (2603:10a6:20b:49c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Fri, 18 Aug 2023 04:04:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT051.mail.protection.outlook.com (100.127.140.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.11 via Frontend Transport; Fri, 18 Aug 2023 04:04:29 +0000 Received: ("Tessian outbound b5a0f4347031:v175"); Fri, 18 Aug 2023 04:04:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: db40bafa0dca1bc0 X-CR-MTA-TID: 64aa7808 Received: from cda1c00c2dbb.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4AD26BCB-43D9-442D-A04B-4BCE2FA87DF8.1; Fri, 18 Aug 2023 04:04:22 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id cda1c00c2dbb.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 18 Aug 2023 04:04:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n6OBTESbOs1im9ZnnAKJRpw3WUDiK6sbZtoON9L56Vc2Whkxo+Z4r6kIOB7UZDexcTBGiGsMiZqIkg4d0+ri03FSXijRpcPbC8zjGqxOp7cs88/YJ7HIpWwovLUlo9V0zqBwm+mwKFqm7mY6GV1KIa918q2FsqzjdHXAfTTQGyZa8JnAlZHnJFQq56YFIZFh7gxN7qJZK4NuKrn3QIYtpWbrFxqys27bYvt/ZalU8vN43sdCizPfK1PK/gxlhqaH1x8Inj7mddi3dosckdTGeZPNRUM/odefDfv9LtAfxHmPGkhr+RjwMf5egJXSz5eNay1zMb93gHk0bUoziW8h3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TCmnQMfZkC7pkLT+CF39mk8Y4JYxW71qw2pYhw3fVuw=; b=fUb2g+vxJ6J2YVsEg4OfBKUr9gxxyewelD7LoVc9KAuc8nrt02MTROHEq1Au3tmoVflftlpByKkcL5z0d/C0CB46iBS0u4mjRslDiOluIsC/vbomPl4wyjZ3JigDgftTfsUTO8t5s4R7Y7pSo0CYmjPPNiJgYNfavp6Ug7d+avgQQNJwrJv8XOu5z43/RRtDPIsl9KSpOSYwZ9OOXsodabf2IzjZWk0Wxha6UkrhcU/eTCjaALLbqFTjIvcwsIXrQZ9oobjP9ec1rq9UK3XoLDcjBQ9uf/JG/q4JW4MUZ6Ebom+Qyc2++St6W0Jylcmra+VPiFs2PiGA2qmbagXFZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TCmnQMfZkC7pkLT+CF39mk8Y4JYxW71qw2pYhw3fVuw=; b=a+jExE9G+0vofADLTo9bN78AHVdfAFnuJLoIq+8esNjWJL4U1yr5760KoEtCzRxCukDgMzpfOZHopKw0Ze3K0yW1QbinRgPd/j1tSiGQbrddcZPR8rtmbQsLE0AmH9y3poMaA+DTVHJ277PfQ/NBhgi0cqVBGKYtQY6bgX7FKVQ= Received: from DBAPR08MB5814.eurprd08.prod.outlook.com (2603:10a6:10:1b1::6) by GV1PR08MB8476.eurprd08.prod.outlook.com (2603:10a6:150:84::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Fri, 18 Aug 2023 04:04:16 +0000 Received: from DBAPR08MB5814.eurprd08.prod.outlook.com ([fe80::b3a3:eb56:481f:99c2]) by DBAPR08MB5814.eurprd08.prod.outlook.com ([fe80::b3a3:eb56:481f:99c2%4]) with mapi id 15.20.6678.031; Fri, 18 Aug 2023 04:04:15 +0000 From: Honnappa Nagarahalli To: Stephen Hemminger , "dev@dpdk.org" CC: Chengwen Feng , Kevin Laatz , Bruce Richardson , Konstantin Ananyev , Ciara Loftus , Qi Zhang , Radu Nicolau , Akhil Goyal , =?iso-8859-1?Q?Mattias_R=F6nnblom?= , Cristian Dumitrescu , "thomas@monjalon.net" , Ferruh Yigit , Andrew Rybchenko , Yipeng Wang , Sameh Gobriel , Vladimir Medvedkin , nd , nd Subject: RE: [PATCH 02/14] all: remove use of word abort Thread-Topic: [PATCH 02/14] all: remove use of word abort Thread-Index: AQHZ0X8wjw/x/xtxnECXCtuDKBbOzq/vbEqQ Date: Fri, 18 Aug 2023 04:04:15 +0000 Message-ID: References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818025249.33994-3-stephen@networkplumber.org> In-Reply-To: <20230818025249.33994-3-stephen@networkplumber.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: D888431CEE399341AFB9B4F80B56F8F9.0 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: DBAPR08MB5814:EE_|GV1PR08MB8476:EE_|AM7EUR03FT051:EE_|AS2PR08MB9787:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b1717df-81cf-451f-8d1e-08db9fa0386a x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: kmmLl/Z8NQCzZeP05U9+CeZDyumhnBixAOiBObDa3Gul4OgmLxDRugsrrbQSqqdxkVN6i00up8Yth7YQWUlALMhecNKG7LXPFTxsQyaUilxPoi/z7ka1mL3Sr5XuF9OaQYC0urKeqRvTHkuL5jxuSSR75A5D7sYCyu5FRD1MlEuFIrYgm3qGbmdQRA7O7ei7d0/+DlAt82VZx1HzoL5cjXzUDz/txPdJPlG+3UEC+C53Hf19qBtWQdgngMv4QH8TwcAA8OoAL5P4MPR9x5XKKwAvtjH94QozhfPovx4CTJXupCb21EI+td1Nr/UCqKuVHzhiZrOu7QtPIExpvUcIdJvOZfkKsEu7jzJLV3rGEjpHgMIFSZkhcilMtA7AHmXtll8BRQDtpGulhVblk57jp4QbahA0bPYTh5ITfX2C+cBzcClS/Olj4/F1UYfb7BgXDEsABc7WLeX8CW1+4k2hr7Ij5W5UJCiG7aGo3PhiPlz9ceAOKiXCXaxXT7xCgWzAvZQtqMgc3kKnKrzb2hnHlFwBNGiij2sdLdLrPgWgCUSDCNkXRX0LzmTiMyKimMEHf1YthorSZ1CosALxo6kb3YROH3fCEY4duSO6lOZg/l8g0MKEjLiy+01ZI+l5CF3Y X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBAPR08MB5814.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(136003)(376002)(366004)(396003)(39860400002)(451199024)(186009)(1800799009)(71200400001)(6506007)(7696005)(53546011)(9686003)(66574015)(83380400001)(5660300002)(8936002)(8676002)(52536014)(4326008)(2906002)(7416002)(30864003)(478600001)(41300700001)(76116006)(110136005)(66946007)(54906003)(64756008)(66446008)(66476007)(66556008)(316002)(38100700002)(38070700005)(122000001)(55016003)(33656002)(86362001)(579004)(559001); DIR:OUT; SFP:1101; Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8476 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 0b9375de-ae6c-46a1-de58-08db9fa02fef X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M59JRAtrYeZrZge3OjeCCJmnTCJ2gGnqRlP/oe7UBxR3oCeGbHOqrplAAOVTKOmvEr4HEjwNYSysejOdptaXXwsVvWEblSf5DvMFe3yuPy1jpm1Y47rIjihci6IKcsyPvu0OmCFY7RiycCEVduPeg9LRzT0gvlxx0CLwqLeX5WQW/68I6Gn1er/30j435O+4wCkh915LmiWONiSFEGvt4Ayxmse4Xt+QmaflmZ9dufZJuvrZ0FpBx0qdMmogTm9cM4WWZiyATEU0bvMjmrv4SD98266bcBCrypcOVueo6yaCL2dgta84v678gSVcWwDNtxhHqjH1rQPSLzhwfDNvhRLPG8D2WMSjew13+joOMCXDNlHomLCDPoYaKD2yqDqF2e2XLzADFCDF5+6cW9t5FWasXtAQhDOkYKJbJmJdaCyg851yAoJHMKxxnlEkgDG4kinDd4qtW7nKPKXLOc13ZCAVRpIz/de8G1Yd0AGPVBfh+9ueqIbzL8XVluvVDQ1jYywOqJp/4A9rBueuAwWlLJNnSoF80NyG2b+/BpMl/IK/USOi32MgAwLRPzS9lC6TM/bEz0Hk0c7Mkr5ameUyXdufYsi2NBq5xQIXg5yjQWlzXRbwX5ocd6tuqz/QdF7M+K8lHyeT5GJivIOhCs2Gz7WG6YXQdLXehrxFN6Kgye1c9zhNDUcfHAYbNBt3q876QgM576BjTY6y0NEY7wPXQRtRu/CcDv/3PBYtqElauctnZkBSh4XJ9MLAEK8f4xDoeCRQOuTdDpQR8R75/1lO0g== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(136003)(396003)(376002)(39860400002)(186009)(1800799009)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(41300700001)(53546011)(316002)(54906003)(26005)(52536014)(7696005)(6506007)(5660300002)(4326008)(8936002)(8676002)(40480700001)(55016003)(40460700003)(9686003)(36860700001)(81166007)(66574015)(47076005)(82740400003)(356005)(478600001)(83380400001)(30864003)(336012)(70206006)(70586007)(33656002)(110136005)(86362001)(2906002)(23180200003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 04:04:29.2522 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b1717df-81cf-451f-8d1e-08db9fa0386a X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM7EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9787 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 > -----Original Message----- > From: Stephen Hemminger > Sent: Thursday, August 17, 2023 9:53 PM > To: dev@dpdk.org > Cc: Stephen Hemminger ; Chengwen Feng > ; Kevin Laatz ; Bruce > Richardson ; Konstantin Ananyev > ; Ciara Loftus ; > Qi Zhang ; Radu Nicolau ; > Akhil Goyal ; Mattias R=F6nnblom > ; Cristian Dumitrescu > ; thomas@monjalon.net; Ferruh Yigit > ; Andrew Rybchenko > ; Yipeng Wang > ; Sameh Gobriel ; > Vladimir Medvedkin ; Honnappa > Nagarahalli > Subject: [PATCH 02/14] all: remove use of word abort >=20 > The term abort is on the Tier 1 "replace immediately" list. >=20 > 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(-) >=20 > diff --git a/app/test-compress-perf/comp_perf_test_cyclecount.c b/app/tes= t- > 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) >=20 > 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 =3D -1; > } > diff --git a/app/test-compress-perf/comp_perf_test_throughput.c b/app/tes= t- > 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) >=20 > 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 =3D -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) >=20 > 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 =3D -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 !=3D stats.submitted) > ERR_RETURN("\nError, not all submitted jobs are > reported as completed\n"); > if (check_err_stats && stats.errors !=3D 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 e= BPF > 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. >=20 > This function fails when the currently configured hierarchy is not suppo= rted > by -the Ethernet port, in which case the user can abort or try out anothe= r > +the Ethernet port, in which case the user can retry with another > hierarchy configuration (e.g. a hierarchy with less leaf nodes), which c= an 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 me= mory > 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 =3D opaque[CLB_VAL_IDX]; > const uint64_t m =3D (uint32_t)~0; >=20 > - /* if the value has changed, abort entering power optimized state */ > + /* if the value has changed, cancel entering power optimized state */ > return (value & m) =3D=3D v ? 0 : -1; > } >=20 > 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 =3D &rt_ip4[*n_rts]; >=20 > APP_CHECK(*n_rts <=3D 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; >=20 > @@ -59,7 +59,7 @@ parse_rt_tokens(char **tokens, uint32_t n_tokens, > route_ipv6 =3D &rt_ip6[*n_rts]; >=20 > APP_CHECK(*n_rts <=3D 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 si= gnature > * will be used by `rte_power_monitor()` to check if the entering of pow= er > - * 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 conditi= on. 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 mat= ch, > the > - * entering of optimized power state will be aborted. This is intended t= o > + * 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 wil= l be > * checked against the expected value, and if they do not match, the ent= ering > 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 i= s > * supported at runtime using `rte_cpu_get_intrinsics_support()` API c= all. > 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 t= o > + * transaction always cancels the transaction since the CPU is not able > + to > * roll-back should the transaction fail. Therefore, hardware transactio= nal > * 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 exam= ple. > * *param_x =3D config->param_x; > * strcpy(param_y, config->param_y); > - * // An alternative to an immediate retry is to abort a= nd > + * // An alternative to an immediate retry is to quit an= d > * // 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" { >=20 >=20 > #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) >=20 > static __rte_always_inline > unsigned int rte_xbegin(void) > @@ -41,7 +41,7 @@ void rte_xend(void) > } >=20 > /* 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) >=20 > 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" >=20 > #define RTE_RTM_MAX_RETRIES (20) > -#define RTE_XABORT_LOCK_BUSY (0xff) > +#define RTE_XCANCEL_LOCK_BUSY (0xff) >=20 > #ifndef RTE_FORCE_INTRINSICS > static inline void > @@ -93,16 +93,16 @@ rte_try_tm(volatile int *lock) >=20 > if (likely(RTE_XBEGIN_STARTED =3D=3D status)) { > if (unlikely(*lock)) > - rte_xabort(RTE_XABORT_LOCK_BUSY); > + rte_xcancel(RTE_XCANCEL_LOCK_BUSY); > else > return 1; > } > while (*lock) > rte_pause(); >=20 > - if ((status & RTE_XABORT_CONFLICT) || > - ((status & RTE_XABORT_EXPLICIT) && > - (RTE_XABORT_CODE(status) =3D=3D RTE_XABORT_LOCK_BUSY))) > { > + if ((status & RTE_XCANCEL_CONFLICT) || > + ((status & RTE_XCANCEL_EXPLICIT) && > + (RTE_XCANCEL_CODE(status) =3D=3D > 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; > } >=20 > - if ((status & RTE_XABORT_RETRY) =3D=3D 0) /* do not retry */ > + if ((status & RTE_XCANCEL_RETRY) =3D=3D 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, >=20 > cur_value =3D __get_umwait_val(pmc->addr, pmc->size); >=20 > - /* check if callback indicates we should abort */ > + /* check if callback indicates we should not proceed */ > if (pmc->fn(cur_value, pmc->opaque) !=3D 0) > goto end; >=20 > @@ -242,7 +242,7 @@ rte_power_monitor_multi(const struct > rte_power_monitor_cond pmc[], > /* start new transaction region */ > rc =3D rte_xbegin(); >=20 > - /* transaction abort, possible write to one of wait addresses */ > + /* transaction canceled, possible write to one of wait addresses */ > if (rc !=3D RTE_XBEGIN_STARTED) > return 0; >=20 > @@ -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); >=20 > @@ -271,7 +271,7 @@ rte_power_monitor_multi(const struct > rte_power_monitor_cond pmc[], >=20 > const uint64_t val =3D __get_umwait_val(c->addr, c->size); >=20 > - /* abort if callback indicates that we need to stop */ > + /* cancel if callback indicates that we need to stop */ > if (c->fn(val, c->opaque) !=3D 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 starte= d. > * > * 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 ano= ther > + * by the Ethernet port, in which case the user can retry out another May be " by the Ethernet port, in which case the user can stop or try out a= nother"? > * hierarchy configuration (e.g. a hierarchy with less leaf nodes), whic= h 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 inde= x > 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] =3D { >=20 > #define RTE_HASH_BFS_QUEUE_MAX_LEN 1000 >=20 > -#define RTE_XABORT_CUCKOO_PATH_INVALIDED 0x4 > +#define RTE_CANCEL_CUCKOO_PATH_INVALIDED 0x4 >=20 > #define RTE_HASH_TSX_MAX_RETRY 10 >=20 > 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 This could be " return zero, that will result in canceling any pending chan= ges 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 This could be " return zero, that will result in canceling any pending chan= ges and" > * return head to its previous position. > * - throw an assert in debug mode. > */ > -- > 2.39.2