From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C0D7DA00C2;
Sun, 20 Feb 2022 04:45:46 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 62B234114A;
Sun, 20 Feb 2022 04:45:13 +0100 (CET)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2040.outbound.protection.outlook.com [40.107.244.40])
by mails.dpdk.org (Postfix) with ESMTP id EA03F410E7
for <dev@dpdk.org>; Sun, 20 Feb 2022 04:45:10 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=Ot/ZOzqwDJIBXpeTuCnqpG9j6eb1z7eAacU/p9uI6dKl+nDj5XXYRpdZHe3kiF/84Ko9ZRtaPzUNXHKpcn2sw3biKS1FefkF8N0TyxficRpRRFHdR7HmMG4nX3P6HjEW14lMo/MDkb9Mgz3WsTLk5eAiWTK+jhZDu3uOgPgr/LPOv4E3rakMiBt1JwFvYtxRTr3uZ0aExP/oIJvMhwRPhbkAHdcP/UrKzlhS02l62b+hx3Q/Sq2IEllbnLWeAjSBt1VP7HBtLQOdr5IEVH4H8xlcmKMr1lCs9Ou+VUoCn10SxKM7I/ETuIOa7fkWy6m4ecBszDfEfBMlzH2z3f4YlA==
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=k8pmHHUUjzX73O9IbnGxTSt292xJageuxx2A7uDEV5c=;
b=NmAn8HPxlRP/oEujdSz+00/N7hvL6WBUTR1xm1WB8Ez739u8iHfaeiAqazkM8qcANoB6UyzmqjFFlmYbSMCiM7PMp4xW00fhZGerk1YiOWkPe+ibstJ6H18NavyXa9tWB5kU2sOaHpZv6Q5PsmSyimUhfJIXCmTGgq/QVvNGN1NSsyoE33xo+AgHi78H7f1lalHHTnW/8nftQptXDm+PWj+8HdqpBN4GQGnp3K+DExEgtdkO6fx2pE7FZsBhF6ZL6cHMBcZh/+7qVs/Cnm4McozAVxDzR9/e/9ejrDkYCAPjQl3AaXkC2VkAj5KTXeKKys2DHa+WH8v3BGlDC2Hsow==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
12.22.5.234) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass
(p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none
(message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=k8pmHHUUjzX73O9IbnGxTSt292xJageuxx2A7uDEV5c=;
b=NCAoimPt3vDdCpepQZeaALxfHGbkpP7XDTrfhuQkxKCx0BoZ33ywNYEqJbGUaNRYCA2xtHNOcf3jLWR4gi2EcPgkZfGNOIpsKHlKM2M3Bg5H5JapBoF4AG9sPEEeFHIggh36/hZi/KosZPrNqiXeNTPYs3kdEOJYHXrj32IpBSZU4kCt3eTq40AgesVR6RNObyK0XdO0hGh1kr2HzYH+O+4mXxIRlF6Qy5+VGDwrOldJhxln7GKDlZzC29w+jVJ68IS54QXyo0k5WuVy8n3eoPNgzvbX3OQWyyGazAzbRWfPRJNT+MzDj9h1IOD+r0S0QtdCdOdBluwENK10C43vAA==
Received: from DM6PR12MB4060.namprd12.prod.outlook.com (2603:10b6:5:216::15)
by MN2PR12MB3118.namprd12.prod.outlook.com (2603:10b6:208:c6::33) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.17; Sun, 20 Feb
2022 03:45:07 +0000
Received: from BN9PR03CA0672.namprd03.prod.outlook.com (2603:10b6:408:10e::17)
by DM6PR12MB4060.namprd12.prod.outlook.com (2603:10b6:5:216::15) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16; Sun, 20 Feb
2022 03:45:04 +0000
Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:10e:cafe::da) by BN9PR03CA0672.outlook.office365.com
(2603:10b6:408:10e::17) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14 via Frontend
Transport; Sun, 20 Feb 2022 03:45:04 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234)
smtp.mailfrom=nvidia.com; dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
12.22.5.234 as permitted sender) receiver=protection.outlook.com;
client-ip=12.22.5.234; helo=mail.nvidia.com;
Received: from mail.nvidia.com (12.22.5.234) by
BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4995.15 via Frontend Transport; Sun, 20 Feb 2022 03:45:04 +0000
Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com
(10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18;
Sun, 20 Feb 2022 03:45:02 +0000
Received: from pegasus01.mtr.labs.mlnx (10.126.230.35) by
rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.9;
Sat, 19 Feb 2022 19:44:58 -0800
From: Alexander Kozyrev <akozyrev@nvidia.com>
To: <dev@dpdk.org>
CC: <orika@nvidia.com>, <thomas@monjalon.net>, <ivan.malov@oktetlabs.ru>,
<andrew.rybchenko@oktetlabs.ru>, <ferruh.yigit@intel.com>,
<mohammad.abdul.awal@intel.com>, <qi.z.zhang@intel.com>,
<jerinj@marvell.com>, <ajit.khaparde@broadcom.com>,
<bruce.richardson@intel.com>
Subject: [PATCH v8 10/11] app/testpmd: add flow queue pull operation
Date: Sun, 20 Feb 2022 05:44:08 +0200
Message-ID: <20220220034409.2226860-11-akozyrev@nvidia.com>
X-Mailer: git-send-email 2.18.2
In-Reply-To: <20220220034409.2226860-1-akozyrev@nvidia.com>
References: <20220219041144.2145380-1-akozyrev@nvidia.com>
<20220220034409.2226860-1-akozyrev@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.126.230.35]
X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 64f2ec08-6199-4b46-5f30-08d9f4236157
X-MS-TrafficTypeDiagnostic: DM6PR12MB4060:EE_|MN2PR12MB3118:EE_
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr,ExtAddr
X-Microsoft-Antispam-PRVS: <DM6PR12MB4060CEB1DC809279332B2F58AF399@DM6PR12MB4060.namprd12.prod.outlook.com>
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: BFWpqOCeVV2gjVm39zAQRnrIaqLIFUcFP/LaYIPd+IjBv0oSkKtEjYlFBkv/ZVZwfOa9aO+9cZdb4PPNxOnPJ4UY7F3+RB7W8NTXk5GkUSmfgQYed0mklWIvsanUmv/XSIAOOg/7cXCTQ1KBXo1XWLr6xe1vb7mdRs+69SXWfqQm70S5eGk7l70VS7+tk3pkXk8IYSQ997RiDL6Kg85+1q9dXj0SuKMfM2XrLYm/vZWyWP0Miu7wsC6yiKsA4IB3X6WyCrANzvHR+ZgXMaiF9nQs0QQN5/WJiVEoMfI6topAAqtHfVmF+aajjbe6qxKWGzqR70YCcOFPzLZ/Suwq8EvOM8e2qFneacVHyQ4Gdg1Z4E3WKGJo3iPwSaYS+WMKyd/E5gdjg1MpDHASwwSOirQSIk83vZzPCMTEHKgy0TmoTIInbT54R36iabEtFO94GhEbcuTyelGKSXi34hcuJqB/uNoj2DNFyKIQeSkuSoQR35w8uZ/5zmETbBIjsMo1dp/6tuOyD9Gs0+OZHClEoyeD/8Z+/wfcJWKqubn75AVv/rPYTNEzFsG82KrApYixoGubGJUICdNGj6r2QrTLGOZkLHoOnzoU8cZFfJZI+IDx0UG1BA+u6/LVs5740M87l9h+QzJM16oQ4lQO7t3oOvxpHV1ZK2iyZZYeNRvglbQGMNwIYm70TYLURYfnRtx8q7JZv3OUV2kPs3w2fEuLVA==
X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE;
SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(186003)(16526019)(26005)(1076003)(8936002)(47076005)(2906002)(36860700001)(83380400001)(36756003)(70586007)(82310400004)(54906003)(316002)(70206006)(2616005)(426003)(4326008)(336012)(8676002)(81166007)(6666004)(7416002)(5660300002)(356005)(40460700003)(508600001)(6916009)(86362001)(36900700001);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:45:04.2222 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 64f2ec08-6199-4b46-5f30-08d9f4236157
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3118
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Add testpmd support for the rte_flow_pull API.
Provide the command line interface for pulling operations results.
Usage example: flow pull 0 queue 0
Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
---
app/test-pmd/cmdline_flow.c | 56 +++++++++++++++-
app/test-pmd/config.c | 74 +++++++++++++--------
app/test-pmd/testpmd.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 25 +++++++
4 files changed, 127 insertions(+), 29 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index af36975cdf..d4b72724e6 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -95,6 +95,7 @@ enum index {
FLEX,
QUEUE,
PUSH,
+ PULL,
/* Flex arguments */
FLEX_ITEM_INIT,
@@ -142,6 +143,9 @@ enum index {
/* Push arguments. */
PUSH_QUEUE,
+ /* Pull arguments. */
+ PULL_QUEUE,
+
/* Table arguments. */
TABLE_CREATE,
TABLE_DESTROY,
@@ -2259,6 +2263,9 @@ static int parse_qo_destroy(struct context *, const struct token *,
static int parse_push(struct context *, const struct token *,
const char *, unsigned int,
void *, unsigned int);
+static int parse_pull(struct context *, const struct token *,
+ const char *, unsigned int,
+ void *, unsigned int);
static int parse_tunnel(struct context *, const struct token *,
const char *, unsigned int,
void *, unsigned int);
@@ -2538,7 +2545,8 @@ static const struct token token_list[] = {
TUNNEL,
FLEX,
QUEUE,
- PUSH)),
+ PUSH,
+ PULL)),
.call = parse_init,
},
/* Top-level command. */
@@ -2934,6 +2942,21 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY(struct buffer, queue)),
},
/* Top-level command. */
+ [PULL] = {
+ .name = "pull",
+ .help = "pull flow operations results",
+ .next = NEXT(NEXT_ENTRY(PULL_QUEUE), NEXT_ENTRY(COMMON_PORT_ID)),
+ .args = ARGS(ARGS_ENTRY(struct buffer, port)),
+ .call = parse_pull,
+ },
+ /* Sub-level commands. */
+ [PULL_QUEUE] = {
+ .name = "queue",
+ .help = "specify queue id",
+ .next = NEXT(NEXT_ENTRY(END), NEXT_ENTRY(COMMON_QUEUE_ID)),
+ .args = ARGS(ARGS_ENTRY(struct buffer, queue)),
+ },
+ /* Top-level command. */
[INDIRECT_ACTION] = {
.name = "indirect_action",
.type = "{command} {port_id} [{arg} [...]]",
@@ -8786,6 +8809,34 @@ parse_push(struct context *ctx, const struct token *token,
return len;
}
+/** Parse tokens for pull command. */
+static int
+parse_pull(struct context *ctx, const struct token *token,
+ const char *str, unsigned int len,
+ void *buf, unsigned int size)
+{
+ struct buffer *out = buf;
+
+ /* 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->command) {
+ if (ctx->curr != PULL)
+ return -1;
+ if (sizeof(*out) > size)
+ return -1;
+ out->command = ctx->curr;
+ ctx->objdata = 0;
+ ctx->object = out;
+ ctx->objmask = NULL;
+ out->args.vc.data = (uint8_t *)out + size;
+ }
+ return len;
+}
+
static int
parse_flex(struct context *ctx, const struct token *token,
const char *str, unsigned int len,
@@ -10174,6 +10225,9 @@ cmd_flow_parsed(const struct buffer *in)
case PUSH:
port_queue_flow_push(in->port, in->queue);
break;
+ case PULL:
+ port_queue_flow_pull(in->port, in->queue);
+ break;
case INDIRECT_ACTION_CREATE:
port_action_handle_create(
in->port, in->args.vc.attr.group,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e3b5e348ab..2bd4359bfe 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2469,14 +2469,12 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id,
const struct rte_flow_action *actions)
{
struct rte_flow_q_ops_attr ops_attr = { .postpone = postpone };
- struct rte_flow_q_op_res comp = { 0 };
struct rte_flow *flow;
struct rte_port *port;
struct port_flow *pf;
struct port_table *pt;
uint32_t id = 0;
bool found;
- int ret = 0;
struct rte_flow_error error = { RTE_FLOW_ERROR_TYPE_NONE, NULL, NULL };
struct rte_flow_action_age *age = age_action_get(actions);
@@ -2539,16 +2537,6 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id,
return port_flow_complain(&error);
}
- while (ret == 0) {
- /* Poisoning to make sure PMDs update it in case of error. */
- memset(&error, 0x22, sizeof(error));
- ret = rte_flow_pull(port_id, queue_id, &comp, 1, &error);
- if (ret < 0) {
- printf("Failed to pull queue\n");
- return -EINVAL;
- }
- }
-
pf->next = port->flow_list;
pf->id = id;
pf->flow = flow;
@@ -2563,7 +2551,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
bool postpone, uint32_t n, const uint32_t *rule)
{
struct rte_flow_q_ops_attr op_attr = { .postpone = postpone };
- struct rte_flow_q_op_res comp = { 0 };
struct rte_port *port;
struct port_flow **tmp;
uint32_t c = 0;
@@ -2599,21 +2586,6 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
ret = port_flow_complain(&error);
continue;
}
-
- while (ret == 0) {
- /*
- * Poisoning to make sure PMD
- * update it in case of error.
- */
- memset(&error, 0x44, sizeof(error));
- ret = rte_flow_pull(port_id, queue_id,
- &comp, 1, &error);
- if (ret < 0) {
- printf("Failed to pull queue\n");
- return -EINVAL;
- }
- }
-
printf("Flow rule #%u destruction enqueued\n", pf->id);
*tmp = pf->next;
free(pf);
@@ -2654,6 +2626,52 @@ port_queue_flow_push(portid_t port_id, queueid_t queue_id)
return ret;
}
+/** Pull queue operation results from the queue. */
+int
+port_queue_flow_pull(portid_t port_id, queueid_t queue_id)
+{
+ struct rte_port *port;
+ struct rte_flow_q_op_res *res;
+ struct rte_flow_error error;
+ int ret = 0;
+ int success = 0;
+ int i;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN) ||
+ port_id == (portid_t)RTE_PORT_ALL)
+ return -EINVAL;
+ port = &ports[port_id];
+
+ if (queue_id >= port->queue_nb) {
+ printf("Queue #%u is invalid\n", queue_id);
+ return -EINVAL;
+ }
+
+ res = calloc(port->queue_sz, sizeof(struct rte_flow_q_op_res));
+ if (!res) {
+ printf("Failed to allocate memory for pulled results\n");
+ return -ENOMEM;
+ }
+
+ memset(&error, 0x66, sizeof(error));
+ ret = rte_flow_pull(port_id, queue_id, res,
+ port->queue_sz, &error);
+ if (ret < 0) {
+ printf("Failed to pull a operation results\n");
+ free(res);
+ return -EINVAL;
+ }
+
+ for (i = 0; i < ret; i++) {
+ if (res[i].status == RTE_FLOW_Q_OP_SUCCESS)
+ success++;
+ }
+ printf("Queue #%u pulled %u operations (%u failed, %u succeeded)\n",
+ queue_id, ret, ret - success, success);
+ free(res);
+ return ret;
+}
+
/** Create flow rule. */
int
port_flow_create(portid_t port_id,
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 24a43fd82c..5ea2408a0b 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -941,6 +941,7 @@ int port_queue_flow_create(portid_t port_id, queueid_t queue_id,
int port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
bool postpone, uint32_t n, const uint32_t *rule);
int port_queue_flow_push(portid_t port_id, queueid_t queue_id);
+int port_queue_flow_pull(portid_t port_id, queueid_t queue_id);
int port_flow_validate(portid_t port_id,
const struct rte_flow_attr *attr,
const struct rte_flow_item *pattern,
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 4f1f908d4a..5080ddb256 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3402,6 +3402,10 @@ following sections.
flow push {port_id} queue {queue_id}
+- Pull all operations results from a queue::
+
+ flow pull {port_id} queue {queue_id}
+
- Create a flow rule::
flow create {port_id}
@@ -3637,6 +3641,23 @@ The usual error message is shown when operations cannot be pushed::
Caught error type [...] ([...]): [...]
+Pulling flow operations results
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``flow pull`` asks the underlying device about flow queue operations
+results and return all the processed (successfully or not) operations.
+It is bound to ``rte_flow_pull()``::
+
+ flow pull {port_id} queue {queue_id}
+
+If successful, it will show::
+
+ Queue #[...] pulled #[...] operations (#[...] failed, #[...] succeeded)
+
+The usual error message is shown when operations results cannot be pulled::
+
+ Caught error type [...] ([...]): [...]
+
Creating a tunnel stub for offload
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3767,6 +3788,8 @@ Otherwise it will show an error message of the form::
This command uses the same pattern items and actions as ``flow create``,
their format is described in `Creating flow rules`_.
+``flow queue pull`` must be called to retrieve the operation status.
+
Attributes
^^^^^^^^^^
@@ -4508,6 +4531,8 @@ message is shown when a rule cannot be destroyed::
Caught error type [...] ([...]): [...]
+``flow queue pull`` must be called to retrieve the operation status.
+
Querying flow rules
~~~~~~~~~~~~~~~~~~~
--
2.18.2