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 5019EA0C48; Tue, 13 Jul 2021 09:29:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 340A9411BD; Tue, 13 Jul 2021 09:29:45 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2062.outbound.protection.outlook.com [40.107.92.62]) by mails.dpdk.org (Postfix) with ESMTP id D77054069E for ; Tue, 13 Jul 2021 09:29:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CpLA8pZkX3+98YEKmOsV4KA2ImgcuYhj8PODlswbJmq6CwhMddHeib8gxLghVh5JuAbeFXSJmXBgzg7piY8tR8fYdnGlIL24yy56kh86FGBQHTDoR1a3kvmefNnPOycinZ68Ym4do65Hvrxlssnx1u/zmf6yw8a+wr2VeFuQ6FdHQlBN+uIA0s4WhrLzRPH458YdFEKfPlyuiT1W5nxRx4Dv0LrT7vS6YJ8viFky7knUjNsiwmdFgRU35bfE2t1b3NvRVycgWI7KI23e2i/m6/MiXvtwMwjndCh+Fy+dtpvsNH2OYZZcvug6hWF/IjwvQ/waa5tj44EilZJfbM7DHQ== 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-SenderADCheck; bh=rCX9XwYu2MmXBg+lcBHgRRD2Q++Sc+Ug5FFfKcwBmzA=; b=KXRuloWOq1201Z0njVTVjf+dnIm5u1zSZMxgLJeq2hWAuBxjDwnu5/Ag81DGeU5qTlDJJmb0qD122/3fXZyl7qSWJEbYrrxIz4RT43KP5SOPSHTP9l/0HfgHK0owJzcfoKLAQBgkIUTOBGZEocs4wgmfGVNdviLVswU995ghKuOF1FphtLi/RdeqyGWa4leUfBJ146Z9/i/qj1oEqYEVBz/StNwvrOBewsoI6WHfiMqxOcfelyKE6U8kWay3wCigeBkqxIth3sJ3AZtfzoBXaAq6MeVUf30pdi/0l0lRvS+/S2U083nUKoaFjDy0uZDOw12noG4NvXNNNQ/tRuTlMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=rCX9XwYu2MmXBg+lcBHgRRD2Q++Sc+Ug5FFfKcwBmzA=; b=Caize4s9r4T+zh1CW7o0P6q628pLkhVYGziArtuW9qtPBAPdlf652Vwl1LKzL0dcjw+PJMtV8Kl8GL9Zu5XYgzW3gQmi74Zo2YcNF+WXaa4V5cJ66LFgAoPfJur7egtbFe4Z+5+YcMqt8V6luFK+bppD3D7dv+gZJthSi65OkxM1sJsQjzDQM4OZQYPE1+GPEPO8zI6UYo740cQswBJsVFDn/vvmNE7QlGZoL3YUwYCe4jSqQNAno1IY27EmXeMCeXnmUvXtL4rzplBJogoZDP2C3fAxPwGNhgolwu4HNWg+AEFlLHr2i1/XpyEs/4YIEA2QRdtCYOfgHW6d4dVSBA== Received: from BN9PR03CA0392.namprd03.prod.outlook.com (2603:10b6:408:111::7) by DM6PR12MB3369.namprd12.prod.outlook.com (2603:10b6:5:117::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.21; Tue, 13 Jul 2021 07:29:41 +0000 Received: from BN8NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::c3) by BN9PR03CA0392.outlook.office365.com (2603:10b6:408:111::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.21 via Frontend Transport; Tue, 13 Jul 2021 07:29:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT026.mail.protection.outlook.com (10.13.177.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Tue, 13 Jul 2021 07:29:40 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Jul 2021 07:29:38 +0000 From: Gregory Etelson To: , CC: , , Ori Kam , Xiaoyun Li Date: Tue, 13 Jul 2021 10:29:25 +0300 Message-ID: <20210713072925.18540-1-getelson@nvidia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210705115217.4768-1-getelson@nvidia.com> References: <20210705115217.4768-1-getelson@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48d78e81-421f-4ca3-37c6-08d945cffa4f X-MS-TrafficTypeDiagnostic: DM6PR12MB3369: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 46YwzvEfEqJXH/3oCWZusSqOCR1IQMxd803dWp+KRSlyVK8e2kgkJ63odAKyR/O9Ufw5OXMOIywU4xd7LAHYgXvN/lQDoua7FVrx/wJaPz7K6H9XSxOMmfRmqEEoIEbD7nqpwqlMiP0Pst6+qSl38Lf6vidhc+JNtF1lB1czEtbv8Q/7o4VnFJ65IUsb19FBe0zrQ4Ba1Wvuhv00GBEpmP6fw6QlBfCHiT5re3gj4n14MlPefAuRuJNymvLFX6lSg/0aK/KQp5tRNFvgwD4L6wvc17b2HAKZCnO57E/4kZR29PvZm6MBIrsv2jCG2TLT7e8C73P3yu4AZi4rya5phWp6pv/xJGPUjoS4wNXHrGheUpi79mJzuzecuBBS8hgMaGPNpvYEfaX40nJA0jHtSGeJu9ASwgBNEXoSTvPx5+E49GIx5xmjVkmbK4DyLKv8U6Gkmw65uzdocIiNytSQmKH6D0W665pNUdulxaXsH4owpd0DMxuITZfMZFWzZ553jzIefO6xlVcsaozaSlalFjo/4L/N9VhRziT9PDDBeWgGmlGmX9/tGeGnIj7tjUJZQclNe31YXebaPSa7ZKblaJnpqAp1n8JkhR/b/HFzqleYpXlhBDpq58LlPnlWBPljbv4v3Sfg8w04ay01+V6Lbx3BuSAf++R3MX1EifNXiT1okvA8ojhkXWLW5LuzJXX9hJc5vQEkldCPwHPuEm8LArZPT2LDnhrWeQu4xIYZVIw= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(136003)(346002)(39860400002)(396003)(36840700001)(46966006)(316002)(7696005)(16526019)(7636003)(47076005)(70206006)(6666004)(5660300002)(36906005)(110136005)(34020700004)(2906002)(54906003)(2616005)(186003)(55016002)(6286002)(70586007)(356005)(86362001)(36756003)(1076003)(336012)(478600001)(82310400003)(36860700001)(426003)(83380400001)(8936002)(8676002)(82740400003)(26005)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 07:29:40.7889 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48d78e81-421f-4ca3-37c6-08d945cffa4f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3369 Subject: [dpdk-dev] [PATCH v2] app/testpmd: add flow item to match on IPv4 version_ihl field 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 Sender: "dev" The new flow item allows PMD to offload IPv4 IHL field for matching, if hardware supports that operation. Signed-off-by: Gregory Etelson --- v2: replace UNSIGNED with COMMON_UNSIGNED following 21.08 API change. --- app/test-pmd/cmdline_flow.c | 13 ++++++++++++- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 8fc0e1469d..34e043621c 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -171,6 +171,7 @@ enum index { ITEM_VLAN_INNER_TYPE, ITEM_VLAN_HAS_MORE_VLAN, ITEM_IPV4, + ITEM_IPV4_VER_IHL, ITEM_IPV4_TOS, ITEM_IPV4_ID, ITEM_IPV4_FRAGMENT_OFFSET, @@ -1069,6 +1070,7 @@ static const enum index item_vlan[] = { }; static const enum index item_ipv4[] = { + ITEM_IPV4_VER_IHL, ITEM_IPV4_TOS, ITEM_IPV4_ID, ITEM_IPV4_FRAGMENT_OFFSET, @@ -2576,6 +2578,14 @@ static const struct token token_list[] = { .next = NEXT(item_ipv4), .call = parse_vc, }, + [ITEM_IPV4_VER_IHL] = { + .name = "version_ihl", + .help = "match header length", + .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ipv4, + hdr.version_ihl)), + }, [ITEM_IPV4_TOS] = { .name = "tos", .help = "type of service", @@ -8193,7 +8203,8 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, uint16_t next_proto) break; case RTE_FLOW_ITEM_TYPE_IPV4: ipv4 = (struct rte_ipv4_hdr *)buf; - ipv4->version_ihl = 0x45; + if (!ipv4->version_ihl) + ipv4->version_ihl = RTE_IPV4_VHL_DEF; if (next_proto && ipv4->next_proto_id == 0) ipv4->next_proto_id = (uint8_t)next_proto; break; diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 33857acf54..ab7e91ad6c 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3654,6 +3654,7 @@ This section lists supported pattern items and their attributes, if any. - ``ipv4``: match IPv4 header. + - ``version_ihl {unsigned}``: IPv4 version and IP header length. - ``tos {unsigned}``: type of service. - ``ttl {unsigned}``: time to live. - ``proto {unsigned}``: next protocol ID. -- 2.31.1