From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 20AC3F92D for ; Fri, 16 Dec 2016 17:26:22 +0100 (CET) Received: by mail-wm0-f53.google.com with SMTP id g23so38779769wme.1 for ; Fri, 16 Dec 2016 08:26:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=QaTcbupP91mvxTRHcL7mw+xi5lHePAb9wBLfXMFAYqs=; b=VyoAMg7E7ER3NZYoJ/e4GhrNxNNs6U6o3tszP3AiZ9uchZT7Gem1xVXrS4bpBiuzyu Nil+RuY8z8amvhvdLaQ2BqxtspAVAYhO5gQiCetFtj5GRiIKkPJpAwwRv7uJO5UGf3H2 Ew2BXnZhSfJ3738TC4/NJhV//u+mIqcj5AmjTI+1TfChJuscufPTsoZ007dIyIR7vRlj wR2aT0jPeqg2qc9jJUdXEWmThrs2eu11Cx3nrn7lh3JAoFL64/9NslLZH9/ynTNi54s8 xTBwQj5gTfvmcpAMWc/nmV6tqtV/CBU9otiec4oFNtmGcGsSySk7FjJt6EcwCk9p/LRP 35rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=QaTcbupP91mvxTRHcL7mw+xi5lHePAb9wBLfXMFAYqs=; b=P+EvAl6HLM8PhGXfGYBytYm3LI3NEWx1Ivw7VdUJFp6NlFrSgqLV6pck877RDytMZm xgfwn7K0bGIZbn1EcrsAfuFqeQOypi82D72SF4Zekce4shYp8EHIUpO+77qRwYnTFoYV ToJR4pHMW2iZ/LI92se4i1ucj4hnEiqa/vtPdHxQqKbpQuO8PiK38Krk+zfRJWYD6rIZ Uj1z9IWKqrTj2Q5k+4wbV4wnz9MsRyEPRZiyv4ViudGQ1bleNUFS1ak//V48yINbrrk7 7ARzdBHKDzJGlekaBY4KNUD/rCloGEdZ4kInCMEkyVIuyOjBQ1e19464Rsh2Vwi14D1e rtMQ== X-Gm-Message-State: AIkVDXIrSDdoMZqNbkqtJ3lC91hHUcV4aWsBqDho/xO/u8wb6vJ9Q0RnJ/SXQNZZ+tR3HaRc X-Received: by 10.28.187.67 with SMTP id l64mr3726575wmf.114.1481905581620; Fri, 16 Dec 2016 08:26:21 -0800 (PST) Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id m145sm4053026wma.3.2016.12.16.08.26.20 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 16 Dec 2016 08:26:21 -0800 (PST) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 16 Dec 2016 17:25:20 +0100 Message-Id: <18cde97d4ff69c9560678fecc0f5f880ac0790a4.1481903839.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 23/25] app/testpmd: add various actions to flow command X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2016 16:26:22 -0000 - MARK: attach 32 bit value to packets. - FLAG: flag packets. - DROP: drop packets. - COUNT: enable counters for a rule. - PF: redirect packets to physical device function. - VF: redirect packets to virtual device function. Signed-off-by: Adrien Mazarguil --- app/test-pmd/cmdline_flow.c | 121 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index a340a75..90712bf 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -153,6 +153,15 @@ enum index { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_MARK, + ACTION_MARK_ID, + ACTION_FLAG, + ACTION_DROP, + ACTION_COUNT, + ACTION_PF, + ACTION_VF, + ACTION_VF_ORIGINAL, + ACTION_VF_ID, }; /** Size of pattern[] field in struct rte_flow_item_raw. */ @@ -476,6 +485,25 @@ static const enum index next_action[] = { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_MARK, + ACTION_FLAG, + ACTION_DROP, + ACTION_COUNT, + ACTION_PF, + ACTION_VF, + ZERO, +}; + +static const enum index action_mark[] = { + ACTION_MARK_ID, + ACTION_NEXT, + ZERO, +}; + +static const enum index action_vf[] = { + ACTION_VF_ORIGINAL, + ACTION_VF_ID, + ACTION_NEXT, ZERO, }; @@ -487,6 +515,8 @@ static int parse_vc(struct context *, const struct token *, void *, unsigned int); static int parse_vc_spec(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); +static int parse_vc_conf(struct context *, const struct token *, + const char *, unsigned int, void *, unsigned int); static int parse_destroy(struct context *, const struct token *, const char *, unsigned int, void *, unsigned int); @@ -1112,6 +1142,70 @@ static const struct token token_list[] = { .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), .call = parse_vc, }, + [ACTION_MARK] = { + .name = "mark", + .help = "attach 32 bit value to packets", + .priv = PRIV_ACTION(MARK, sizeof(struct rte_flow_action_mark)), + .next = NEXT(action_mark), + .call = parse_vc, + }, + [ACTION_MARK_ID] = { + .name = "id", + .help = "32 bit value to return with packets", + .next = NEXT(action_mark, NEXT_ENTRY(UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mark, id)), + .call = parse_vc_conf, + }, + [ACTION_FLAG] = { + .name = "flag", + .help = "flag packets", + .priv = PRIV_ACTION(FLAG, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, + [ACTION_DROP] = { + .name = "drop", + .help = "drop packets (note: passthru has priority)", + .priv = PRIV_ACTION(DROP, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, + [ACTION_COUNT] = { + .name = "count", + .help = "enable counters for this rule", + .priv = PRIV_ACTION(COUNT, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, + [ACTION_PF] = { + .name = "pf", + .help = "redirect packets to physical device function", + .priv = PRIV_ACTION(PF, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, + [ACTION_VF] = { + .name = "vf", + .help = "redirect packets to virtual device function", + .priv = PRIV_ACTION(VF, sizeof(struct rte_flow_action_vf)), + .next = NEXT(action_vf), + .call = parse_vc, + }, + [ACTION_VF_ORIGINAL] = { + .name = "original", + .help = "use original VF ID if possible", + .next = NEXT(action_vf, NEXT_ENTRY(BOOLEAN)), + .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_vf, + original, 1)), + .call = parse_vc_conf, + }, + [ACTION_VF_ID] = { + .name = "id", + .help = "VF ID to redirect packets to", + .next = NEXT(action_vf, NEXT_ENTRY(UNSIGNED)), + .args = ARGS(ARGS_ENTRY(struct rte_flow_action_vf, id)), + .call = parse_vc_conf, + }, }; /** Remove and return last entry from argument stack. */ @@ -1435,6 +1529,33 @@ parse_vc_spec(struct context *ctx, const struct token *token, return len; } +/** Parse action configuration field. */ +static int +parse_vc_conf(struct context *ctx, const struct token *token, + const char *str, unsigned int len, + void *buf, unsigned int size) +{ + struct buffer *out = buf; + struct rte_flow_action *action; + + (void)size; + /* Token name must match. */ + if (parse_default(ctx, token, str, len, NULL, 0) < 0) + return -1; + /* Nothing else to do if there is no buffer. */ + if (!out) + return len; + if (!out->args.vc.actions_n) + return -1; + action = &out->args.vc.actions[out->args.vc.actions_n - 1]; + /* Point to selected object. */ + ctx->object = out->args.vc.data; + ctx->objmask = NULL; + /* Update configuration pointer. */ + action->conf = ctx->object; + return len; +} + /** Parse tokens for destroy command. */ static int parse_destroy(struct context *ctx, const struct token *token, -- 2.1.4