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 1B4C2A0A0F; Mon, 5 Jul 2021 13:52:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A61C7411DD; Mon, 5 Jul 2021 13:52:38 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2056.outbound.protection.outlook.com [40.107.93.56]) by mails.dpdk.org (Postfix) with ESMTP id 967794068C for ; Mon, 5 Jul 2021 13:52:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hgVp9R5QStj38yAFnUOACDf54K8tTZb+RItFBLkwq0/mkiQNMwZ7Ci/taf+sapotoOOkbZvoWe0S2Vg1L8lq9NIjfflVW2mTskqDfnpcBmpHE3e3PzVWpnAjowjyXPQD/IugnpbhisvEK4iDczTsqGE5F9jxs4HVnaXF5O9hR/8gKEs8HkIws9uaK6qLLUFciF00qq5CE4mXspxO9TMTxIyACzgG2qO/R83smzOlvC8fmShKuZUta9OOblbkVR7vBXT9Umd45A8shT/FbgLN9FvL7zvCnfYNx17/DI9tba5RsDnIEgaibaRGENuh7ytEPyeMkSGPS2s3uLc6WaN61g== 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=CQYmezBEUvfVOLuBPBXpu+qV5A4zRcuhuoA+DglAMZw=; b=ArirAyYQgjZG9iyLLqOE9mX3RRiB6uyt0huykelZaSvkDDmLyrs1iQL8u8MXh7pfE+VSDPL2gCV/KxSrMfX2V66tRJees0I88dooEqHNKrpO/bo4AaXKxcYtRE58WfmANZ4HuXGxL6ssspn67wbY+ZFN4JfXHDM0IXe9coMGrtk4i9yxixXLGeyaYV/6OLMkbXY00rJAh38NnaNIH0i/eH4g3ku2iW0nKUq2THSInMUnXc0xQLIUaVBfd1NRy2liIT2owh++tqILTNxFPWpbDsEH1wWf7eZz/wEnfCTyLtZwsyKsbuFB1AqnvlvjuobCxFH3BOSK4Xd38gSwteempQ== 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=CQYmezBEUvfVOLuBPBXpu+qV5A4zRcuhuoA+DglAMZw=; b=URrQelDiOn3vOqEwNLFiT/08FC1wVvIUrun5BhrxV/a46KdCjznhWBrPRhqIf029ljNPPL0V80p2owgdE+BGzaOEqtT0WtkCst79ncs2k4L2BV+EeofZxnzBJ6BR5ggv7MDrRsBU7bqBy4LfHM9p3S8hXfqA6fyE9Uz/nOcnHpVcOPJwB3qr5fTq60UPj/Qfr1wfM4/IyLqM1JPt+aMsez9rL6INf6/fCkQXB/1ydT35VptvdM//EM2T3axWEadU+JZOQDQHSMubkaDLPibPuZrehk+dt5jn6waY2oIFAwwRGMpZO42lwYcTn8gz4Tf9vscLODdR1O9S1LvMYf4EDA== Received: from DM6PR02CA0141.namprd02.prod.outlook.com (2603:10b6:5:332::8) by DM6PR12MB2906.namprd12.prod.outlook.com (2603:10b6:5:15f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21; Mon, 5 Jul 2021 11:52:35 +0000 Received: from DM6NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::4a) by DM6PR02CA0141.outlook.office365.com (2603:10b6:5:332::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Mon, 5 Jul 2021 11:52:35 +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 DM6NAM11FT026.mail.protection.outlook.com (10.13.172.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 11:52:35 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 11:52:33 +0000 From: Gregory Etelson To: CC: , , Ori Kam , Xiaoyun Li Date: Mon, 5 Jul 2021 14:52:17 +0300 Message-ID: <20210705115217.4768-1-getelson@nvidia.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50263918-3f24-4f49-575b-08d93fab6168 X-MS-TrafficTypeDiagnostic: DM6PR12MB2906: 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: aamSctmwv5PjoPsvzR6kUtgSFAZqoSk3iz0+Wy3uAqcf/GxG/88ZzB+7rZB81MfWeL2AptmFrls+Btvkans5bCU/OXwD9LXqK0ezF/6onKG4JXM2MLB+gywmv6Dwwt0gc9y4NWjxtCnbWtmeFqGep04Wp2vVe7wdH4KmE1iK5b9y+wjOxw8DSHI2vYWMyCGMoO81hSdmm+OdU/7kay9+qALXXuff9Ok3GtNTiqJpylMj58y30XOteiyu4g7fWn14pwPjJ4OlgOCxo/jIH0jTYSaNNluaxUCIPAw62aXyoRcEi5W6kRwxwGDaexwr8A4ZZhxXmcmjDAYyvEhuAdVadRNXEzAnMsc6mAzqjMf7/PJjIwDwh5jnevK4C8Bc3VAGh7OvOALVexGcbu9PjHzpmEUd/2PLx8qCjWStvgwKVLv8ift+Tm6n1ZlEZW464Xitnuv9CawjVXvJrLglWd8OYp8mJ5eZzo38rh6LDwDsvVLMEdO4g0aRZDzBx+PkkLL+M8+wy+NR5dxEPVRERo/sCwBFQTGG8jzHpzrdFew1uFSyLAgMXMgCl4YvCb2qB/QV2H4Oue/fDo9WIFvQMvUQkAF2u6zxfPOMVXuPv0Bb0GY6LP+n4EQXVGaEA2HVLOFRGamQsz0N13qJVcqI4yohW+x0Y40CahM/Wz8w0iewa8T4kTN+gbB4fkapKdv+1YC1q1xt6eV2+3yShtagNrPblQ== 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)(39860400002)(136003)(376002)(346002)(396003)(36840700001)(46966006)(4326008)(86362001)(6286002)(5660300002)(83380400001)(82740400003)(82310400003)(36860700001)(47076005)(2906002)(1076003)(8676002)(8936002)(186003)(36756003)(356005)(16526019)(7696005)(6916009)(336012)(426003)(2616005)(55016002)(316002)(54906003)(6666004)(36906005)(70586007)(70206006)(26005)(7636003)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 11:52:35.4701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50263918-3f24-4f49-575b-08d93fab6168 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: DM6NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2906 Subject: [dpdk-dev] [PATCH] 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 item allows PMD to offload IPv4 IHL field for matching, if hardware supports that operation. Signed-off-by: Gregory Etelson --- app/test-pmd/cmdline_flow.c | 12 +++++++++++- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 1c587bb7b8..c1c7b9a9f9 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -173,6 +173,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, @@ -1071,6 +1072,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, @@ -2567,6 +2569,13 @@ 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(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ipv4, + hdr.version_ihl)), + }, [ITEM_IPV4_TOS] = { .name = "tos", .help = "type of service", @@ -8123,7 +8132,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