From patchwork Wed Dec 21 07:39:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 121169 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 BE3C4A034C; Wed, 21 Dec 2022 08:40:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 903D442D42; Wed, 21 Dec 2022 08:40:12 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2070.outbound.protection.outlook.com [40.107.94.70]) by mails.dpdk.org (Postfix) with ESMTP id 0577142D42 for ; Wed, 21 Dec 2022 08:40:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ECuMPmVgpvScb63La94qC6W37ICw9JqGOTSWdliVMK9t32t+tvp2gsmeKfm93OMjMstdHQg7aMRgiJGAYAbdgVmpDd1pF6D5wwYmx7c/hfy52wk1vhsmnifStrIyy7YG/4dY6jAoN6x1CBKsD/vfSkhXwih9u623zD7+bz4hMTZ5PwtrF8ExXyOd9TflToxwcdHO8TBrihZNNNT9jaITiPDl3essL7pPu+4G0/AOq9y+wXHC6FLZIvq0E1DBmdBwahnhUCZc/xQa9p4qV5T2DvikRbSDV+JrR7j7Pjif2sCrR61qVAzhlty5PnEsqyqZmkkbL6Q5MXdfrh75AvMc3w== 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=n4110C27NtoHDFlpGKaQFjCIqit3ZohPV4Fi0Q13g0E=; b=DDt7Z8VURBkCneWEz0GfAwqBAgPhpfc1+avcChEzaYHXNs7H+sigsedqMdMBNykFsBkWffdZpdNjp7EpQ84EcZnNXFIdz7X6f1fRWjJN8BT/Nc4MXJ7+6VlH+ck/tC6MSIhgB6nQLGKe9n+d3XiXMVaG/4rWwkPfDMt+70gbfKvrX4HvFPUXoRkW3akGUHJafG0wcDIdr7UNdmx7chDezEaevO2kEjKVs6ptWcyJd5Uq3X8jGpXtWQ4EuHnZRJb4oRABJinoolBhOa3Tokhnh8HlKwmBKk+SD4agVG7mH9X7B/xinN40bP9jItpPPiAwrYbULvXCfo5i/9bioG2QLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=n4110C27NtoHDFlpGKaQFjCIqit3ZohPV4Fi0Q13g0E=; b=r70/sfj+lzY1ykP1hYmSnj//KxrHLP3ZaI3/lsLTE3e6IMqZF7huAglLlTNIyTY4xdApSepXG3yd9LGK1HLSUaWuwF2JtOZUf0fav/nCwd1WSLAZgbwPuwQcKj3om9SjVtbc1DROpUb+VIspkMTdiIU49N4gW1V2Zlyu9M2fxQaYls/GxB4uzt1VNXW84P2jW2EjH2C3BeyTmiqjKkcuiohoKlC3KzF67NjB4VCb97+d53XhLPStBebpHONBTyps5rmddGvjxuNhqiPA42ihgeWegpxRa0AB7u7geIzWXuyD6Mr9rn9dvc++X10cLjDyyDERYwQ1k3gkoHqnneImvw== Received: from DM6PR03CA0045.namprd03.prod.outlook.com (2603:10b6:5:100::22) by BL1PR12MB5061.namprd12.prod.outlook.com (2603:10b6:208:310::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 07:40:08 +0000 Received: from DM6NAM11FT111.eop-nam11.prod.protection.outlook.com (2603:10b6:5:100:cafe::6f) by DM6PR03CA0045.outlook.office365.com (2603:10b6:5:100::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Wed, 21 Dec 2022 07:40:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT111.mail.protection.outlook.com (10.13.173.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.10 via Frontend Transport; Wed, 21 Dec 2022 07:40:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 23:39:58 -0800 Received: from nvidia.com (10.126.231.37) 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.36; Tue, 20 Dec 2022 23:39:55 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang CC: , Subject: [RFC 9/9] app/testpmd: raw encap with flex item support Date: Wed, 21 Dec 2022 09:39:18 +0200 Message-ID: <20221221073918.3581151-10-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221221073918.3581151-1-rongweil@nvidia.com> References: <20221221073918.3581151-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT111:EE_|BL1PR12MB5061:EE_ X-MS-Office365-Filtering-Correlation-Id: 94c8ef24-27da-403f-f69d-08dae3269588 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ftWwEqFl+nh/nIyC4Vv0rtKRHdg9odM9vU8vIwwxGT9OkyipSwTIe3e5gJ14mTKg8/OWptH7+KYcvGjXHdG/RM0JQlrCA969jB5z8qZjRFg9mQlRI1i2ToUKTElwpfpaNZ80NihC313/r1R6F1ki7JAOHqMD1LfPtKN6dTKrj6R6HoBOZnFPiWCKxUo4aFx8KgeXmYhUsS8LjlSGUdV/iPPr/JU/BNVAU0q94rkpz3PiiX8K2BJtsy6ZjxXJfPJXgLWiziTanY46wz7oub6Akas2s3roy5TurMzfw+xFk/hUpx1hrXPj1BRgWxc+X1+99+yDQ083yHeia/7XNnlw7ULOMqloonibbW/m5omkzYyaoW/l6q/NZjur8wMY09R6UF3KAhFK8M2Gg/0OowuqwiHdS2586aS4t8cFR2DufLbFM9f1bhFP5UWrVgcabcQbw2lU2AyO7fGp8kP0TIFPQyt2Ba/Kv0QDfFhVe1ZZ/u8GdXriJG/r0/E8Z+DKaZaz36E7zi1zVuh2UB7Fl4t4oUrUfqiDbjE9bHXN36wLMbYnpHgv45sbeqT5UEoaQlsteFHhUJUpwg4kRItNPvqlLnmikULPhW+3NqhJ38dKneiNDq64zxNR6i0LB3QfQxcTe/exUJ5xsbOomcab6i/+5+sFBJb3LcSRPZzU5I2ySgQQBeGH6+nUatfPiXV9nqRFpEbGx+gCW0dX6g32l/1ABQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(396003)(39860400002)(346002)(136003)(451199015)(40470700004)(36840700001)(46966006)(2616005)(86362001)(82740400003)(36860700001)(107886003)(6666004)(2906002)(6286002)(186003)(40460700003)(336012)(16526019)(110136005)(36756003)(26005)(7696005)(478600001)(8936002)(316002)(356005)(55016003)(54906003)(40480700001)(70206006)(8676002)(4326008)(41300700001)(7636003)(82310400005)(1076003)(426003)(70586007)(5660300002)(47076005)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 07:40:08.1827 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94c8ef24-27da-403f-f69d-08dae3269588 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT111.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5061 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 Application should retrieve raw_encap buffer from spec->pattern if it is flex item. Signed-off-by: Rongwei Liu --- app/test-pmd/cmdline_flow.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 1158da2122..b5f13f797a 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -12540,6 +12540,7 @@ cmd_set_raw_parsed(const struct buffer *in) uint16_t proto = 0; uint16_t idx = in->port; /* We borrow port field as index */ int gtp_psc = -1; /* GTP PSC option index. */ + const void *src_spec; if (in->command == SET_SAMPLE_ACTIONS) return cmd_set_raw_parsed_sample(in); @@ -12563,6 +12564,7 @@ cmd_set_raw_parsed(const struct buffer *in) item = in->args.vc.pattern + i; if (item->spec == NULL) item->spec = flow_item_default_mask(item); + src_spec = item->spec; switch (item->type) { case RTE_FLOW_ITEM_TYPE_ETH: size = sizeof(struct rte_ether_hdr); @@ -12690,9 +12692,13 @@ cmd_set_raw_parsed(const struct buffer *in) size = sizeof(struct rte_flow_item_pfcp); break; case RTE_FLOW_ITEM_TYPE_FLEX: - size = item->spec ? - ((const struct rte_flow_item_flex *) - item->spec)->length : 0; + if (item->spec != NULL) { + size = ((const struct rte_flow_item_flex *)item->spec)->length; + src_spec = ((const struct rte_flow_item_flex *)item->spec)->pattern; + } else { + size = 0; + src_spec = NULL; + } break; case RTE_FLOW_ITEM_TYPE_GRE_OPTION: size = 0; @@ -12725,12 +12731,14 @@ cmd_set_raw_parsed(const struct buffer *in) fprintf(stderr, "Error - Not supported item\n"); goto error; } - *total_size += size; - rte_memcpy(data_tail - (*total_size), item->spec, size); - /* update some fields which cannot be set by cmdline */ - update_fields((data_tail - (*total_size)), item, - upper_layer); - upper_layer = proto; + if (size) { + *total_size += size; + rte_memcpy(data_tail - (*total_size), src_spec, size); + /* update some fields which cannot be set by cmdline */ + update_fields((data_tail - (*total_size)), item, + upper_layer); + upper_layer = proto; + } } if (verbose_level & 0x1) printf("total data size is %zu\n", (*total_size));