From patchwork Tue Jul 13 06:51:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Britstein X-Patchwork-Id: 1504435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=b/cqLqKv; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GPBCD4Cn1z9sWl for ; Tue, 13 Jul 2021 16:52:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E33E783A56; Tue, 13 Jul 2021 06:52:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OQNp-DgjaNEm; Tue, 13 Jul 2021 06:52:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0D30483A4B; Tue, 13 Jul 2021 06:52:17 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D5C10C0010; Tue, 13 Jul 2021 06:52:17 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3364AC000E for ; Tue, 13 Jul 2021 06:52:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 21B41405B6 for ; Tue, 13 Jul 2021 06:52:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=nvidia.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1Fz-aq-dt4xn for ; Tue, 13 Jul 2021 06:52:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2067.outbound.protection.outlook.com [40.107.220.67]) by smtp4.osuosl.org (Postfix) with ESMTPS id AFE2A405B1 for ; Tue, 13 Jul 2021 06:52:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TAqZCSvmIbBRPI5ZNWwcuPPHxWj8F3fnQC+9Y1J3cwVe+c3GNdzXW/e2dIAWNIZaxucLAvOt7/1KHPkoMWojtW9+ARBQF/C9eyzPrLk/swjjH2JwTanWR77iuxp8uIy8JM1Qmvv0ducYboiEgAW2SpzjG9QO4lWkU405jKGM9qFv6ST1dtDDMrcPL29Rv8FVi6TnCqHMLluYIHJ+J4mzOw3zw8/PiRL/7+jj4wGTkDk0v1MGREIaVuzip/uCzv8BQEYwyr+37VOXCOUhrbvIHeiFnJH2ngiIQuwSygU1BAHjOBA/Xq5D9ajD0b7tlAECgu4opw8jf7imXuO0jOGHNA== 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=YDi1D+hSAOtXNMF7DUbv5cL8tVEFOy3aF7jhBbDBYkU=; b=gTpd/rQF49+TUGNqIoVRDwi37ItkOdb38vh1ztQTGXyRz/pludY5k7l5PzRz1eECjGDBPB8EUtqVa/rSLQq0aNvVf7NOUuVrD3hYU8RkKAOCPyG7ISyva4J1MsLNi46f2T/T7ewQsPb7l1Mj74jVpIpVcJXGAbiA6HYcHNVZgCQIlBKvg1EuNqj6aCN9iQ393PCJvJsaK+PLn7Kvoae3F8CcbcY7uYbb780GaYXPBu+O7TZh74jlK7lu+jy37RGSB0keAdkX3b57pHGb+PSJJb6CBoJ7zW8uD8yinlOEKjfdsMJjKDmqUWoUHrMkca1S2CxJQUCCHT30ydZCAtuYNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=ovn.org 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=YDi1D+hSAOtXNMF7DUbv5cL8tVEFOy3aF7jhBbDBYkU=; b=b/cqLqKvYmJX1cD2qkCVXexc1gIVsgoLuDyJmg15jI+/oCmoB4+15FSzA3/tVWRz0hQCxH6lZn/RWb2GqphM9CnyyS3HUhfG/kfW1H24ENXLzdVwVlkIK8uHnfnaOgs+XcA1ozeyj3qlPZXDXVqtRWfiru2WFvhfnQ71d0DoMNAoJXm2HaEEalAHpbvyvEsR3en9pa7Go2YGGf+oawjGOCHBCqvmljy1JPmv3ORcugjcHy9sO2IKv8OmzZH1f72aKmGHs4d5zfatt+h3eqthzblxIbU4y6uWd9mYXmnmn4Hp5HIpJ53ebdaPEOiPmGGi3sEw18WPDeA4ER4kVTV6lQ== Received: from DS7PR03CA0233.namprd03.prod.outlook.com (2603:10b6:5:3ba::28) by SN6PR12MB4704.namprd12.prod.outlook.com (2603:10b6:805:e8::19) 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 06:52:12 +0000 Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::dd) by DS7PR03CA0233.outlook.office365.com (2603:10b6:5:3ba::28) 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 06:52:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; ovn.org; dkim=none (message not signed) header.d=none;ovn.org; 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 DM6NAM11FT031.mail.protection.outlook.com (10.13.172.203) 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 06:52:11 +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 06:52:09 +0000 From: Eli Britstein To: , Ilya Maximets Date: Tue, 13 Jul 2021 09:51:46 +0300 Message-ID: <20210713065147.30734-1-elibr@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4aa6872a-0740-4693-0d93-08d945cabd95 X-MS-TrafficTypeDiagnostic: SN6PR12MB4704: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:130; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YsP6TxkdgYGdiswARrSO2Q3eiOYOdnkONC/49SZZz0pPni53OYo5HZi6Y0HsQxiGEVxus4UVx/V58I04LcaNVGau5RoHAvtMVG3j/+1/HOqH0Ny7gqATFduMwghfxu6Cl35p0nHPkQtwnFHh0/aZemq5v0ix0j3IH+7mxNMlWOaH2ayRhsTc6JQ5P+cc2BXI8wY4vg+GZugPdqpAMDy0TBEWXgM2xkx58dywCFz3tRbadu6ROUgDdJ6yScWhQL87WpQB1Y70ESfhZzp8vq4NPfUzDit86dD55YACGkPQkXJsl+Mrwn4ry+9eG7G9/aEi+2nbPWC5W5LbKM+5KmAXBWihFmBZEWYkEXEMbQnPwsctkiFggAECjhgGFFETX5k4wmtc+zF78E4ZAkmaK59gggPlXE/dwOBtP1oXysGILe1jbYHCyzpO4ZCooi3fKJeykAd8d1AebHaD8v1o2lHdaHhhB07YrUNxs06tnuJEpSBXRFwrtxAqqspIEa2POlhx0hPkM5iHy0WEBeaGGzOayTCwv+CJkXVGilrXwTd8rlCdpRnOIRITkRuz290Myg9y/U0+f8yvuotwNgEN9fKipQf77uLAOZKN13wApkI7pCw64invEXi7E3EVtf5sGrgyASdGV3pihKQe8lY+43zwjSy3JgMqnG1L5L0/9HKj9QqH62wdqcbRcszg+y3TCxTRFMm90ieKnbs5qCPntG8H0xJr3mdrfswcnmidREXm8Ig= 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)(136003)(39860400002)(376002)(346002)(396003)(46966006)(36840700001)(4326008)(8936002)(336012)(107886003)(8676002)(2906002)(55016002)(1076003)(6286002)(34020700004)(36906005)(70586007)(70206006)(47076005)(7696005)(426003)(2616005)(316002)(26005)(478600001)(54906003)(82740400003)(16526019)(5660300002)(36756003)(82310400003)(36860700001)(110136005)(7636003)(356005)(86362001)(186003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 06:52:11.4859 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4aa6872a-0740-4693-0d93-08d945cabd95 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: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4704 Cc: Majd Dibbiny Subject: [ovs-dev] [PATCH V2 1/2] netdev-offload-dpdk: Use has_vlan match attribute X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" DPDK 20.11 introduced an ability to specify existance/non-existance of VLAN tag by [1]. Use this attribute. [1]: 09315fc83861 ("ethdev: add VLAN attributes to ethernet and VLAN items") Signed-off-by: Eli Britstein Reviewed-by: Salem Sol --- lib/netdev-offload-dpdk.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index e7913292e..3e0d0643b 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -210,6 +210,8 @@ dump_flow_pattern(struct ds *s, ds_put_cstr(s, "eth "); if (eth_spec) { + uint32_t has_vlan_mask; + if (!eth_mask) { eth_mask = &rte_flow_item_eth_mask; } @@ -222,6 +224,9 @@ dump_flow_pattern(struct ds *s, DUMP_PATTERN_ITEM(eth_mask->type, "type", "0x%04"PRIx16, ntohs(eth_spec->type), ntohs(eth_mask->type)); + has_vlan_mask = eth_mask->has_vlan ? UINT32_MAX : 0; + DUMP_PATTERN_ITEM(has_vlan_mask, "has_vlan", "%d", + eth_spec->has_vlan, eth_mask->has_vlan); } ds_put_cstr(s, "/ "); } else if (item->type == RTE_FLOW_ITEM_TYPE_VLAN) { @@ -1037,6 +1042,7 @@ parse_flow_match(struct netdev *netdev, struct flow_patterns *patterns, struct match *match) { + struct rte_flow_item_eth *eth_spec = NULL, *eth_mask = NULL; struct flow *consumed_masks; uint8_t proto = 0; @@ -1082,6 +1088,11 @@ parse_flow_match(struct netdev *netdev, memset(&consumed_masks->dl_src, 0, sizeof consumed_masks->dl_src); consumed_masks->dl_type = 0; + spec->has_vlan = 0; + mask->has_vlan = 1; + eth_spec = spec; + eth_mask = mask; + add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, spec, mask); } @@ -1098,6 +1109,11 @@ parse_flow_match(struct netdev *netdev, /* Match any protocols. */ mask->inner_type = 0; + if (eth_spec && eth_mask) { + eth_spec->has_vlan = 1; + eth_mask->has_vlan = 1; + } + add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_VLAN, spec, mask); } /* For untagged matching match->wc.masks.vlans[0].tci is 0xFFFF and From patchwork Tue Jul 13 06:51:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Britstein X-Patchwork-Id: 1504436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=nxT2SIwF; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GPBCG1Bsyz9sWc for ; Tue, 13 Jul 2021 16:52:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3A1F56083F; Tue, 13 Jul 2021 06:52:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zKhftjEgiuwq; Tue, 13 Jul 2021 06:52:22 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id EFB7C6086A; Tue, 13 Jul 2021 06:52:20 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D0908C0010; Tue, 13 Jul 2021 06:52:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id E5177C0027 for ; Tue, 13 Jul 2021 06:52:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D48B74042B for ; Tue, 13 Jul 2021 06:52:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=nvidia.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EkOtsWhjqpjX for ; Tue, 13 Jul 2021 06:52:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2052.outbound.protection.outlook.com [40.107.93.52]) by smtp2.osuosl.org (Postfix) with ESMTPS id 52C41400FA for ; Tue, 13 Jul 2021 06:52:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IilarsvRjUI4vXL/uYeyUIe2P1xoKGKJreDNM2Je3ab5z1OGT75WxAoy+86cZ/ES0zISUxFVAkFgPjT01SaPSBAMj8ruKcT+EQlnIDh0IwYWhiND96LSuH1dhbmd4s81h0T6RPT5grbRHKAMFqjW+6JbOzXTxxtHyo1OI7fc5HeHtKQcCZnxX3/H1Tm+vtdbR4eq2oUbo9A+82+8XzibkHmmlJo0bFFFRy/QQtEdH6GmnR+eq/MDzWMUn6+/6i23vVRCGgCFrHgEewArx+ACKRScI0iHMLFo3t+AWqlqmwVqAJQuanPgnOJWdE+lNdB4is73a9MNBEDVMxPb0v0zkg== 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=wsXXxn9IzCa2nvXEUNlMzq4yldqQwseHrow65c45njs=; b=Yl03welb1jbrTVq3GFNlJcZHlzKgpaekrBe4RgZR9P7gQ2WsMs8dHBDjLqhLtnV7ZJ1Hap/Ciu38OoWzyz/QSh+vJKCXG8QYmFuKXXD5w4ljNGP5UqNDXih94m88TK7YHc0faeIeWa3FSt6qegxJFrTETQy5lf5Bs4fT4bG3VNwsZUTTQqBzmy0ZgMn9TxcPy8lAzCBGBYaknkiniCcHNx+9sqyP2yX1tbZMMQbuRpJxxJxY8Enhqcv8k+ms414cwWcFB84uxCGAmH29T7h6V2cRvfWxDR1m+5mInbMubegiF678NNmGTtqkbhPq/xPx++sYfUu8RWXXnx5WXRUNPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=ovn.org 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=wsXXxn9IzCa2nvXEUNlMzq4yldqQwseHrow65c45njs=; b=nxT2SIwF03JXsNLC4fUo/Y21cq0WleqZbGTCYtEOWtWCzRy+Z5ftOjytFgiMBCZ4NR6VWZPXuzZGMB0+gPiTsM+NDyL/Y7ftl78jMY6vJS9hU35XIfAsbx8/HYUsJPjLJriE/op0QUPZ4WpPD4RQPq9Cv1Zm9SanM3scvQLX/sm5Al4qWehH26PGjB/8ugKKT60H17+biNQVhe0YVf2R5laMEnLufQBAqp5ZDNot3BpvNo6ffI98/2vgNMHlUBH/6xIf23sYPoKVtkDxq8YIrBSBGbq0DR8HIpclHI3tEt9cRjq9UlC52vUZPjfU0PaRkYbW+FFbIRMth3Q17xHIiQ== Received: from DM5PR06CA0059.namprd06.prod.outlook.com (2603:10b6:3:37::21) by DM5PR12MB1866.namprd12.prod.outlook.com (2603:10b6:3:10c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.22; Tue, 13 Jul 2021 06:52:14 +0000 Received: from DM6NAM11FT029.eop-nam11.prod.protection.outlook.com (2603:10b6:3:37:cafe::33) by DM5PR06CA0059.outlook.office365.com (2603:10b6:3:37::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19 via Frontend Transport; Tue, 13 Jul 2021 06:52:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; ovn.org; dkim=none (message not signed) header.d=none;ovn.org; 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 DM6NAM11FT029.mail.protection.outlook.com (10.13.173.23) 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 06:52:14 +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 06:52:12 +0000 From: Eli Britstein To: , Ilya Maximets Date: Tue, 13 Jul 2021 09:51:47 +0300 Message-ID: <20210713065147.30734-2-elibr@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210713065147.30734-1-elibr@nvidia.com> References: <20210713065147.30734-1-elibr@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1eb68756-04db-4dd4-9166-08d945cabf63 X-MS-TrafficTypeDiagnostic: DM5PR12MB1866: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1TSP+zHlFLAKwl/KFf5c+vHiUOj6E4C9H7Ajn26R4yeoG3zTXRe8H+ppkKhnPHtAbO64+CtR+2z0OBfmlRuCYqH6kHFuFdp+QwYRz2X2r5jKfcKkKq/iSQ+enyszbOYRjwkHVYlADh4VRngmPffPplKWMajcBg7M4UjQ3pMsdS5jJiHRNQxBKCJu+vhk9dyerh/nDxgmuPc5ybglVYclHn965wTDeyrlVOWKLmwSxOu5RNFl/aQJQrbBhhgGZ7WMm9aebr42FL7h+PqSXoLRbwfaryl0nsrKTlNi+7FqcVV31B/qZjf/0vbyyJgNDziew27okMDxuDyXQJylIY6SM7KCs9HILmG71nQTf3BVFUXLCfhYLcD14/teHL/gZUB0kPRUnAQJO+tZaF7Mr6SnlUwqCP+ZqJhvw+qy/NQhfDO0Nhs/Fy87BnAaHoTpMakRTI2srAp7qR+jHI/sDThKuh3KWYb1fMPMHA7qrH47ZkNW1I49vhh40EneQHqKgxvvG8BV6ID3ShrigVD3VxzYu/Baba18pZCLW830DHM5t9pK/zoZu7GyTJl8WT1oDeIiTPCuSFOP+mjZDp+oFWHx+qbF5GbsB/KkeWO1+qcO3s2xbjusTE8hCOW/Ody+xNOO5l1nEOUPGEr+pyp6iovV7l5rK1RxRC5FMGd8X/pj2PX8O2Mu2GMOu39o9lYGb3MbVxOdqyFij9NNYG9GLQx7RITn5wPSo8Onftx4MZ7crbE= 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)(396003)(346002)(136003)(39860400002)(376002)(36840700001)(46966006)(26005)(426003)(186003)(16526019)(86362001)(47076005)(478600001)(2616005)(36860700001)(336012)(55016002)(82740400003)(36756003)(107886003)(7696005)(5660300002)(70206006)(70586007)(6666004)(6286002)(1076003)(4326008)(8936002)(54906003)(8676002)(316002)(7636003)(356005)(36906005)(110136005)(83380400001)(34020700004)(2906002)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 06:52:14.5176 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1eb68756-04db-4dd4-9166-08d945cabf63 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: DM6NAM11FT029.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1866 Cc: Majd Dibbiny Subject: [ovs-dev] [PATCH V2 2/2] netdev-offload-dpdk: Fix ethernet type for VLANs X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" For VLANs, the match of ethernet type should be specified in inner_type field of the vlan match, and not type field in ethernet match. Fix it. Fixes: e8a2b5bf92bb ("netdev-dpdk: implement flow offload with rte flow") Signed-off-by: Eli Britstein Reviewed-by: Salem Sol --- lib/netdev-offload-dpdk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 3e0d0643b..65f9b3685 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -1106,12 +1106,13 @@ parse_flow_match(struct netdev *netdev, spec->tci = match->flow.vlans[0].tci & ~htons(VLAN_CFI); mask->tci = match->wc.masks.vlans[0].tci & ~htons(VLAN_CFI); - /* Match any protocols. */ - mask->inner_type = 0; - if (eth_spec && eth_mask) { eth_spec->has_vlan = 1; eth_mask->has_vlan = 1; + spec->inner_type = eth_spec->type; + mask->inner_type = eth_mask->type; + eth_spec->type = match->flow.vlans[0].tpid; + eth_mask->type = match->wc.masks.vlans[0].tpid; } add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_VLAN, spec, mask);