From patchwork Fri Aug 18 17:45:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130528 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DACB4309A; Fri, 18 Aug 2023 19:47:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3441243247; Fri, 18 Aug 2023 19:46:51 +0200 (CEST) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mails.dpdk.org (Postfix) with ESMTP id B1E4E43000 for ; Fri, 18 Aug 2023 19:46:47 +0200 (CEST) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-686be3cbea0so1620423b3a.0 for ; Fri, 18 Aug 2023 10:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692380806; x=1692985606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=; b=gmmDe+EDBNVMkOENEbGksg4K9e4pQxH+S7PChBNtqCkAw9OI0U0yhA/r0h68cP5z9p qggR/sYYgT9r5zN5ri02zdueL6H0fEW7zf677gGAb7DS10iDpvNr/ImMCuYbl+sf/Wcr wThCTgCpE/rAjenxCEu39Xau/qfr11sMc0yUWXfzsqzlYpgSrwS9fnwBVPaZLFRy1ln1 S6BWO+F6W8kkZ9c9LuxF12vntvUQNv11bdt+7jISldt57tlDPP4N2N1eBSwIiVdsr9U5 KWsrqJoNA66bAK6us/nN1oFupngg9JK+IrY2E98jZO8X++nMdVoNAprndDCJvHZh07mx vvJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380806; x=1692985606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ewhaNkdq3bkDh6t0/3wXfY16a9goFAYwn9Iw7+zVkQk=; b=V7JzB0sEAc8CP2BGuBKiX8++w6Nd3ilLG7g/aDHUbz0JCxOaayf56PtgQQ+xkvttqZ gXbR5KD2Dwopal9efeO2MR0kXTHhz3TqTVelICukyklBnQFtAIWn0nEAE+87zYPsY6Nc +fOXdJ0qQnF2kzverwvlrpsUXN8zQq7aEAHQt+FNLGoQ1spND+BBgGpFZAVR9a1hTytM AyPWuqoZ0ilIUmMHB4W/nEXfdAAXsjYo2JvQoEoz7m1PDb9inrz2ylmMmY+Tn74e2jLX XLu+Wz2TO3Uhc+PYQICIwpbZ8nb/vyYPGThXVns8NuK6vnaM48IgYjjG8uAoc615YZZ/ eiHw== X-Gm-Message-State: AOJu0YyeW6yl6cxjAWlURmSnsItaGTHeOMiVNRgl49AGmoExO97AhnO1 ZfqszoD+iHwidrqWBYv2ljBlxLMa/gYVfzGCF3A3yw== X-Google-Smtp-Source: AGHT+IFDeqkXaCtfXLk96ox0YhF4Kx254RhV5mG3JreS51CKKdCu7es1dafEjIbV6R9e1KhLv6gxRA== X-Received: by 2002:a05:6a20:918e:b0:13e:debc:3657 with SMTP id v14-20020a056a20918e00b0013edebc3657mr3334591pzd.30.1692380806565; Fri, 18 Aug 2023 10:46:46 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id u20-20020aa78394000000b0066a2e8431a0sm1804610pfm.183.2023.08.18.10.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:46:46 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Cristian Dumitrescu Subject: [PATCH v2 03/13] pipeline: remove use of term abort Date: Fri, 18 Aug 2023 10:45:27 -0700 Message-Id: <20230818174537.290222-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230818174537.290222-1-stephen@networkplumber.org> References: <20230818025249.33994-1-stephen@networkplumber.org> <20230818174537.290222-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Replace with cancel. Signed-off-by: Stephen Hemminger --- examples/pipeline/cli.c | 20 ++++++++++---------- lib/pipeline/rte_swx_ctl.c | 29 +++++++++++++++-------------- lib/pipeline/rte_swx_ctl.h | 8 ++++---- lib/pipeline/version.map | 2 +- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c index 2ae6cc579ff2..090e5e470106 100644 --- a/examples/pipeline/cli.c +++ b/examples/pipeline/cli.c @@ -1778,14 +1778,14 @@ cmd_pipeline_commit(char **tokens, status = rte_swx_ctl_pipeline_commit(ctl, 1); if (status) snprintf(out, out_size, "Commit failed. " - "Use \"commit\" to retry or \"abort\" to discard the pending work.\n"); + "Use \"commit\" to retry or \"cancel\" to discard the pending work.\n"); } -static const char cmd_pipeline_abort_help[] = -"pipeline abort\n"; +static const char cmd_pipeline_cancel_help[] = +"pipeline cancel\n"; static void -cmd_pipeline_abort(char **tokens, +cmd_pipeline_cancel(char **tokens, uint32_t n_tokens, char *out, size_t out_size, @@ -1806,7 +1806,7 @@ cmd_pipeline_abort(char **tokens, return; } - rte_swx_ctl_pipeline_abort(ctl); + rte_swx_ctl_pipeline_cancel(ctl); } static const char cmd_pipeline_regrd_help[] = @@ -3474,8 +3474,8 @@ cmd_help(char **tokens, "\tpipeline selector group member delete\n" "\tpipeline selector show\n" "\tpipeline learner default\n" + "\tpipeline cancel\n" "\tpipeline commit\n" - "\tpipeline abort\n" "\tpipeline regrd\n" "\tpipeline regwr\n" "\tpipeline meter profile add\n" @@ -3648,9 +3648,9 @@ cmd_help(char **tokens, if ((strcmp(tokens[0], "pipeline") == 0) && (n_tokens == 2) && - (strcmp(tokens[1], "abort") == 0)) { + (strcmp(tokens[1], "cancel") == 0)) { snprintf(out, out_size, "\n%s\n", - cmd_pipeline_abort_help); + cmd_pipeline_cancel_help); return; } @@ -3934,8 +3934,8 @@ cli_process(char *in, char *out, size_t out_size, void *obj) } if ((n_tokens >= 3) && - (strcmp(tokens[2], "abort") == 0)) { - cmd_pipeline_abort(tokens, n_tokens, out, + (strcmp(tokens[2], "cancel") == 0)) { + cmd_pipeline_cancel(tokens, n_tokens, out, out_size, obj); return; } diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c index 857770d297a4..41d07e9b3a19 100644 --- a/lib/pipeline/rte_swx_ctl.c +++ b/lib/pipeline/rte_swx_ctl.c @@ -2063,7 +2063,7 @@ table_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id) * failed commit operation to remove ALL the pending work for ALL the tables. */ static void -table_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id) +table_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id) { struct table *table = &ctl->tables[table_id]; @@ -2366,7 +2366,7 @@ selector_rollback(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id) } static void -selector_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id) +selector_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t selector_id) { struct selector *s = &ctl->selectors[selector_id]; uint32_t group_id; @@ -2545,7 +2545,7 @@ learner_rollfwd_finalize(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id) } static void -learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id) +learner_cancel(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id) { struct learner *l = &ctl->learners[learner_id]; @@ -2554,7 +2554,8 @@ learner_abort(struct rte_swx_ctl_pipeline *ctl, uint32_t learner_id) } int -rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail) +rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, + int cancel_on_fail) { struct rte_swx_table_state *ts; int status = 0; @@ -2622,25 +2623,25 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, int abort_on_fail) rollback: for (i = 0; i < ctl->info.n_tables; i++) { table_rollback(ctl, i); - if (abort_on_fail) - table_abort(ctl, i); + if (cancel_on_fail) + table_cancel(ctl, i); } for (i = 0; i < ctl->info.n_selectors; i++) { selector_rollback(ctl, i); - if (abort_on_fail) - selector_abort(ctl, i); + if (cancel_on_fail) + selector_cancel(ctl, i); } - if (abort_on_fail) + if (cancel_on_fail) for (i = 0; i < ctl->info.n_learners; i++) - learner_abort(ctl, i); + learner_cancel(ctl, i); return status; } void -rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl) +rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl) { uint32_t i; @@ -2648,13 +2649,13 @@ rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl) return; for (i = 0; i < ctl->info.n_tables; i++) - table_abort(ctl, i); + table_cancel(ctl, i); for (i = 0; i < ctl->info.n_selectors; i++) - selector_abort(ctl, i); + selector_cancel(ctl, i); for (i = 0; i < ctl->info.n_learners; i++) - learner_abort(ctl, i); + learner_cancel(ctl, i); } static int diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h index 6ef2551ab534..14973b74172b 100644 --- a/lib/pipeline/rte_swx_ctl.h +++ b/lib/pipeline/rte_swx_ctl.h @@ -1045,7 +1045,7 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl, * * @param[in] ctl * Pipeline control handle. - * @param[in] abort_on_fail + * @param[in] revert_on_fail * When non-zero (false), all the scheduled work is discarded after a failed * commit. Otherwise, the scheduled work is still kept pending for the next * commit. @@ -1056,10 +1056,10 @@ rte_swx_ctl_pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *ctl, __rte_experimental int rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, - int abort_on_fail); + int revert_on_fail); /** - * Pipeline abort + * Pipeline cancel * * Discard all the scheduled table work. * @@ -1068,7 +1068,7 @@ rte_swx_ctl_pipeline_commit(struct rte_swx_ctl_pipeline *ctl, */ __rte_experimental void -rte_swx_ctl_pipeline_abort(struct rte_swx_ctl_pipeline *ctl); +rte_swx_ctl_pipeline_cancel(struct rte_swx_ctl_pipeline *ctl); /** * Pipeline table entry read diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map index 6997b69340ef..1ddd598fa079 100644 --- a/lib/pipeline/version.map +++ b/lib/pipeline/version.map @@ -62,7 +62,7 @@ EXPERIMENTAL { # added in 20.11 rte_swx_ctl_action_arg_info_get; rte_swx_ctl_action_info_get; - rte_swx_ctl_pipeline_abort; + rte_swx_ctl_pipeline_cancel; rte_swx_ctl_pipeline_commit; rte_swx_ctl_pipeline_create; rte_swx_ctl_pipeline_free;