From patchwork Mon Dec 7 16:27:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Finn, Emma" X-Patchwork-Id: 1412112 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=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CqTHQ6dSjz9s1l for ; Tue, 8 Dec 2020 03:27:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 00D622E279; Mon, 7 Dec 2020 16:27:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MswqyyLF0yfr; Mon, 7 Dec 2020 16:27:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 9371020006; Mon, 7 Dec 2020 16:27:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 771F4C0FA7; Mon, 7 Dec 2020 16:27:26 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id AABBAC013B for ; Mon, 7 Dec 2020 16:27:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9A0028714B for ; Mon, 7 Dec 2020 16:27:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DEF9g0UqV_gu for ; Mon, 7 Dec 2020 16:27:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 540AA8713E for ; Mon, 7 Dec 2020 16:27:22 +0000 (UTC) IronPort-SDR: pYf6k7FRYqzzScnA9CaB5NWTC0Jm8QrDbNRDxqaTIGjkybHyUSyBvsl6G4T8KILG9lPPSiBdkQ /w8UnxP00mFg== X-IronPort-AV: E=McAfee;i="6000,8403,9827"; a="160772206" X-IronPort-AV: E=Sophos;i="5.78,400,1599548400"; d="scan'208";a="160772206" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2020 08:27:21 -0800 IronPort-SDR: rk+8jgW08rnQtkjZmgKiLarfLqVATGlTUq6sUrtZgw4LsDfyGb+A5JWJSFtHuYjlwH9JqYFzu5 kU+y2DN/36Ag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,400,1599548400"; d="scan'208";a="367263614" Received: from silpixa00397517.ir.intel.com ([10.237.222.183]) by fmsmga004.fm.intel.com with ESMTP; 07 Dec 2020 08:27:19 -0800 From: Emma Finn To: dev@openvswitch.org, ian.stokes@intel.com, i.maximets@ovn.org, elibr@nvidia.com Date: Mon, 7 Dec 2020 16:27:15 +0000 Message-Id: <1607358435-23502-1-git-send-email-emma.finn@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH] netdev-offload-dpdk: Reverting Temporary patch to fix broken hardware offload ethernet matching for XL710 NICs. 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Removing temporary patch - 023f257 (netdev-offload-dpdk: Fix for broken ethernet matching HWOL for XL710NIC). Ethernet pattern is now being set correctly withtin the i40e PMD. Signed-off-by: Emma Finn --- lib/netdev-offload-dpdk.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 01c52e1..916f42b 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -695,20 +695,7 @@ parse_flow_match(struct flow_patterns *patterns, consumed_masks->packet_type = 0; /* Eth */ - if (match->wc.masks.dl_type == OVS_BE16_MAX && is_ip_any(&match->flow) - && eth_addr_is_zero(match->wc.masks.dl_dst) - && eth_addr_is_zero(match->wc.masks.dl_src)) { - /* - * This is a temporary work around to fix ethernet pattern for partial - * hardware offload for X710 devices. This fix will be reverted once - * the issue is fixed within the i40e PMD driver. - */ - add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, NULL, NULL); - - memset(&consumed_masks->dl_dst, 0, sizeof consumed_masks->dl_dst); - memset(&consumed_masks->dl_src, 0, sizeof consumed_masks->dl_src); - consumed_masks->dl_type = 0; - } else if (match->wc.masks.dl_type || + if (match->wc.masks.dl_type || !eth_addr_is_zero(match->wc.masks.dl_src) || !eth_addr_is_zero(match->wc.masks.dl_dst)) { struct rte_flow_item_eth *spec, *mask;