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 C8FB7A034F for ; Wed, 10 Nov 2021 07:49:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B8D9340142; Wed, 10 Nov 2021 07:49:23 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2083.outbound.protection.outlook.com [40.107.223.83]) by mails.dpdk.org (Postfix) with ESMTP id 0ABC840142 for ; Wed, 10 Nov 2021 07:49:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UPeyDOpryP7Y6rbLxs2a4jQ9VqHPz4LyVWvB4PiGAafDb/3z20V/vQdjWnm8RUaVH+0JFGDyKQCJs8LzEkA1DLLmMDiB8FB03WbARJ8Oc/FlDhtzdiTxanvdygkovszPT1xJoJuY9saZw+PZUjzZTIaFNfNwqlWGyfeR7ul4QgRCBo+tRBG8409q8+/MGRMRFkn1uT/30ZC5rIDWrglV0FqMZZnKYoaKr24XemPmeByaeU/FSeQ6BgnDYbOxq6YRO2LLirq8T0iURdU/gO4GvxK6s2GF2Wkg/J5yGeQnQXZpWWLib+RhTQmHafPRjJM9zImWapE/nD7Lk3sHFj2mPA== 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=qPd6TRWUhBZjgCZVv+/49t1rK3AkmQypS8uat7dI/xY=; b=mussIKlCBBEXoKUWGOa6/DtGwzvJzQKBxaG4NyvLxq/ECq22p4DW+tBZfR341dLzOXI0NXeyw9wzzbn8C/ZWIZkl8jozW6NTULcl6GiFwDZVsEwwMqh6v9IkS3y+MFS0YBBzjO7Rq41KuVRDXuV3bG5l6SW3e9HKOZWt3PxXrMCsiQUNU73hFK/5F0GB4sKfwHqnSodjral2O/WvNzmEP4uDZ7C/DyBl+VE9b6fBu9lC5WfLsEbrrbca+QLZ4fKDdDcOggXH0PJlJZLI+6qK2Wv7YPaj6O1Fio33bAoCAQPir1naIzoQ6n74/fDg3BYwTZJcTF9/ZDxZzpNO2OEG0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=temperror 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=qPd6TRWUhBZjgCZVv+/49t1rK3AkmQypS8uat7dI/xY=; b=KFwWnteKWYoGOPIu0DdibTON/IfXexErtvdqf5g9oTWGbmoGMSHHQptZEI3AqT20/9+ndTslzHj+nTCThNTEIDEKN/luQ5a/brvojd56dMvLko6ns9DS/e6HdyjP75AMnM20qNLKlV4uioEQIQIFTLfnotksZ0Tu7xgSJKCSIxjclYi3RshKAx7UkFjUm1D6Gg4n5kz6qBG1FTSlYAK1IdMPZsk0Tx0AON7w2FNsKeY5j4HOBMJ6j4lb+IVO2caIXmyBaMf8ofCzB7vL12sW72YRtsoB2Tcopw7XaEXXuc8T2iTXrQolgNb9D6kKWjZGWLKuZDmwac3tn2/EFvCv9g== Received: from BN8PR12CA0032.namprd12.prod.outlook.com (2603:10b6:408:60::45) by DM5PR1201MB0107.namprd12.prod.outlook.com (2603:10b6:4:55::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 06:49:20 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::a) by BN8PR12CA0032.outlook.office365.com (2603:10b6:408:60::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:49:20 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=temperror action=none header.from=nvidia.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nvidia.com: DNS Timeout) Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:49:18 +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.18; Wed, 10 Nov 2021 06:49:15 +0000 From: Xueming Li To: Tal Shnaiderman CC: Luca Boccassi , Matan Azrad , "Idan Hackmon" , dpdk stable Date: Wed, 10 Nov 2021 14:30:34 +0800 Message-ID: <20211110063216.2744012-151-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 309043d1-34f3-4b28-8155-08d9a4163855 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0107: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +B2nkeMyQxEsJUXPxD3duX61X6pzz6Hxegh+fiRFlDtzv3UNVPtRJn4ANRbgh7AP3U7BBwG6gUwTFh1xTX/X3jiSuTNyP001p3H7eRlFUhLJ76DurVUImz4MT6k37mrCgj2vsBrEHyR/kJkyNjWYIFvcOug+RYPZHYUr4srdtcooXpnZ2STeBUyg9IK8Z3Hng+B+CZaBxaI9o54puEU2sIX1G3C6U9Z/e5iqsNxCxP7QdRZSuNRkdlZBznAzI3SqE03lvXdOKRph9/Be8bpabZurm9CJtCPMBX514uP37booQKnZNBmR94aJPEMSEoHoAUG5vYDBNpIIH3VTd+oOykGYKmUbqgVTlt4gIB6zv7xzXxFtFVOQcBq9aEt/o0BD7dGESa/pjRWpUx6oFNeCuiMJveEXC5MVrEhdReFdRjQklrLtRhRChFqITevKty08t9ppj8Bc5fhsq+5KjwQJtr7XA9shQ+6suYV5CzPnq0I/zQzYp6aWpPZuwTLL7cdAINa2YZX140Up2+KzGXbuZeMB64Z76hxyCurvCKvMET3ecTMkGqzWPLoBXXmXQtqs+licSMSCh5uRfj8f/h3kt00ufNdWh9LRYS82iyW7Mqn+pODQdNJ88bYdVJheR8CsZ31R9fKwlp3/s0woqbVi4cw4uwX7PCh2yhImSlth6VyPo+NFkxeUoYfBXRjysd3IVewl+Q2D5p/Q/ouCjsTDp41pkWdefTpXbwfnnzw7dsR0g9aYlRg/dfJd50zYvp/LQRrQe0s1qMxazKAW1fxLFZfXpUQi3etE8Vn0fPLZSKKYc2xRdjDGrI7mYworYyV8BYHioBvaKbYFN8wqj66j/A== 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)(36840700001)(46966006)(508600001)(26005)(54906003)(4326008)(2616005)(7696005)(6666004)(36906005)(16526019)(70206006)(83380400001)(1076003)(2906002)(37006003)(70586007)(86362001)(186003)(47076005)(53546011)(4001150100001)(82310400003)(6286002)(63350400001)(336012)(55016002)(316002)(356005)(63370400001)(426003)(8936002)(7636003)(6636002)(36756003)(966005)(30864003)(6862004)(8676002)(36860700001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:49:18.8520 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 309043d1-34f3-4b28-8155-08d9a4163855 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: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0107 Subject: [dpdk-stable] patch 'net/mlx5: fix tunneling support query' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/3d8dfe94bdc766526f3d61b8900e8d7fd6a06ede Thanks. Xueming Li --- >From 3d8dfe94bdc766526f3d61b8900e8d7fd6a06ede Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Tue, 12 Oct 2021 15:45:45 +0300 Subject: [PATCH] net/mlx5: fix tunneling support query Cc: Xueming Li [ upstream commit c1a320bf899e5ff8d3e3a4f291ee61c8a98a8bda ] Currently, the PMD decides if the tunneling offload can enable VXLAN/GRE/GENEVE tunneled TSO support by checking config->tunnel_en (single bit) and config->tso. This is incorrect, the right way is to check the following flags returned by the mlx5dv_query_device function: MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN - if supported the offload DEV_TX_OFFLOAD_VXLAN_TNL_TSO can be enabled. MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE - if supported the offload DEV_TX_OFFLOAD_GRE_TNL_TSO can be enabled. MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE - if supported the offload DEV_TX_OFFLOAD_GENEVE_TNL_TSO can be enabled. The fix enables the offloads according to the correct flags returned by the kernel. Fixes: dbccb4cddcd2 ("net/mlx5: convert to new Tx offloads API") Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad Tested-by: Idan Hackmon --- drivers/net/mlx5/linux/mlx5_os.c | 28 +++++++++++++++++----------- drivers/net/mlx5/linux/mlx5_os.h | 15 +++++++++++++++ drivers/net/mlx5/mlx5.h | 2 +- drivers/net/mlx5/mlx5_txq.c | 24 +++++++++++++++++++----- 4 files changed, 52 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 714feba36e..cc4fa3dd97 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -755,7 +755,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, int err = 0; unsigned int hw_padding = 0; unsigned int mps; - unsigned int tunnel_en = 0; unsigned int mpls_en = 0; unsigned int swp = 0; unsigned int mprq = 0; @@ -949,20 +948,27 @@ err_secondary: config->cqe_comp = 1; #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) { - tunnel_en = ((dv_attr.tunnel_offloads_caps & - MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN) && - (dv_attr.tunnel_offloads_caps & - MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE) && - (dv_attr.tunnel_offloads_caps & - MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE)); - } - DRV_LOG(DEBUG, "tunnel offloading is %ssupported", - tunnel_en ? "" : "not "); + config->tunnel_en = dv_attr.tunnel_offloads_caps & + (MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN | + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE | + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE); + } + if (config->tunnel_en) { + DRV_LOG(DEBUG, "tunnel offloading is supported for %s%s%s", + config->tunnel_en & + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN ? "[VXLAN]" : "", + config->tunnel_en & + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE ? "[GRE]" : "", + config->tunnel_en & + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE ? "[GENEVE]" : "" + ); + } else { + DRV_LOG(DEBUG, "tunnel offloading is not supported"); + } #else DRV_LOG(WARNING, "tunnel offloading disabled due to old OFED/rdma-core version"); #endif - config->tunnel_en = tunnel_en; #ifdef HAVE_IBV_DEVICE_MPLS_SUPPORT mpls_en = ((dv_attr.tunnel_offloads_caps & MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_CW_MPLS_OVER_GRE) && diff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h index d9d464b5e3..a524f71d2b 100644 --- a/drivers/net/mlx5/linux/mlx5_os.h +++ b/drivers/net/mlx5/linux/mlx5_os.h @@ -31,4 +31,19 @@ enum mlx5_sw_parsing_offloads { MLX5_SW_PARSING_TSO_CAP = 0, #endif }; + +enum mlx5_tunnel_offloads { +#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT + MLX5_TUNNELED_OFFLOADS_VXLAN_CAP = + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN, + MLX5_TUNNELED_OFFLOADS_GRE_CAP = + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE, + MLX5_TUNNELED_OFFLOADS_GENEVE_CAP = + MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE, +#else + MLX5_TUNNELED_OFFLOADS_VXLAN_CAP = 0, + MLX5_TUNNELED_OFFLOADS_GRE_CAP = 0, + MLX5_TUNNELED_OFFLOADS_GENEVE_CAP = 0, +#endif +}; #endif /* RTE_PMD_MLX5_OS_H_ */ diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 9c8991aba6..3d6d5bb923 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -202,7 +202,7 @@ struct mlx5_dev_config { unsigned int hw_fcs_strip:1; /* FCS stripping is supported. */ unsigned int hw_padding:1; /* End alignment padding is supported. */ unsigned int vf:1; /* This is a VF. */ - unsigned int tunnel_en:1; + unsigned int tunnel_en:3; /* Whether tunnel stateless offloads are supported. */ unsigned int mpls_en:1; /* MPLS over GRE/UDP is enabled. */ unsigned int cqe_comp:1; /* CQE compression is enabled. */ diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 1354cc9619..5f1a179df3 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -118,10 +118,17 @@ mlx5_get_tx_port_offloads(struct rte_eth_dev *dev) if (config->tunnel_en) { if (config->hw_csum) offloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; - if (config->tso) - offloads |= (DEV_TX_OFFLOAD_VXLAN_TNL_TSO | - DEV_TX_OFFLOAD_GRE_TNL_TSO | - DEV_TX_OFFLOAD_GENEVE_TNL_TSO); + if (config->tso) { + if (config->tunnel_en & + MLX5_TUNNELED_OFFLOADS_VXLAN_CAP) + offloads |= DEV_TX_OFFLOAD_VXLAN_TNL_TSO; + if (config->tunnel_en & + MLX5_TUNNELED_OFFLOADS_GRE_CAP) + offloads |= DEV_TX_OFFLOAD_GRE_TNL_TSO; + if (config->tunnel_en & + MLX5_TUNNELED_OFFLOADS_GENEVE_CAP) + offloads |= DEV_TX_OFFLOAD_GENEVE_TNL_TSO; + } } return offloads; } @@ -970,7 +977,14 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) MLX5_MAX_TSO_HEADER); txq_ctrl->txq.tso_en = 1; } - txq_ctrl->txq.tunnel_en = config->tunnel_en | config->swp; + if (((DEV_TX_OFFLOAD_VXLAN_TNL_TSO & txq_ctrl->txq.offloads) && + (config->tunnel_en & MLX5_TUNNELED_OFFLOADS_VXLAN_CAP)) | + ((DEV_TX_OFFLOAD_GRE_TNL_TSO & txq_ctrl->txq.offloads) && + (config->tunnel_en & MLX5_TUNNELED_OFFLOADS_GRE_CAP)) | + ((DEV_TX_OFFLOAD_GENEVE_TNL_TSO & txq_ctrl->txq.offloads) && + (config->tunnel_en & MLX5_TUNNELED_OFFLOADS_GENEVE_CAP)) | + (config->swp & MLX5_SW_PARSING_TSO_CAP)) + txq_ctrl->txq.tunnel_en = 1; txq_ctrl->txq.swp_en = (((DEV_TX_OFFLOAD_IP_TNL_TSO | DEV_TX_OFFLOAD_UDP_TNL_TSO) & txq_ctrl->txq.offloads) && (config->swp & -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.606458859 +0800 +++ 0150-net-mlx5-fix-tunneling-support-query.patch 2021-11-10 14:17:01.937412212 +0800 @@ -1 +1 @@ -From c1a320bf899e5ff8d3e3a4f291ee61c8a98a8bda Mon Sep 17 00:00:00 2001 +From 3d8dfe94bdc766526f3d61b8900e8d7fd6a06ede Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c1a320bf899e5ff8d3e3a4f291ee61c8a98a8bda ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -30,6 +32,5 @@ - drivers/net/mlx5/linux/mlx5_os.c | 28 +++++++++++++++++----------- - drivers/net/mlx5/linux/mlx5_os.h | 15 +++++++++++++++ - drivers/net/mlx5/mlx5.h | 2 +- - drivers/net/mlx5/mlx5_txq.c | 24 +++++++++++++++++++----- - drivers/net/mlx5/windows/mlx5_os.h | 6 ++++++ - 5 files changed, 58 insertions(+), 17 deletions(-) + drivers/net/mlx5/linux/mlx5_os.c | 28 +++++++++++++++++----------- + drivers/net/mlx5/linux/mlx5_os.h | 15 +++++++++++++++ + drivers/net/mlx5/mlx5.h | 2 +- + drivers/net/mlx5/mlx5_txq.c | 24 +++++++++++++++++++----- + 4 files changed, 52 insertions(+), 17 deletions(-) @@ -38 +39 @@ -index e08082ed70..26a8d75b99 100644 +index 714feba36e..cc4fa3dd97 100644 @@ -41 +42 @@ -@@ -963,7 +963,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, +@@ -755,7 +755,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, @@ -49 +50 @@ -@@ -1144,20 +1143,27 @@ err_secondary: +@@ -949,20 +948,27 @@ err_secondary: @@ -88 +89 @@ -index da036edb72..80c70d713a 100644 +index d9d464b5e3..a524f71d2b 100644 @@ -91 +92 @@ -@@ -33,4 +33,19 @@ enum mlx5_sw_parsing_offloads { +@@ -31,4 +31,19 @@ enum mlx5_sw_parsing_offloads { @@ -112 +113 @@ -index 483bf35f85..6dde6210d1 100644 +index 9c8991aba6..3d6d5bb923 100644 @@ -115 +116,2 @@ -@@ -251,7 +251,7 @@ struct mlx5_dev_config { +@@ -202,7 +202,7 @@ struct mlx5_dev_config { + unsigned int hw_fcs_strip:1; /* FCS stripping is supported. */ @@ -118 +119,0 @@ - unsigned int sf:1; /* This is a SF. */ @@ -125 +126 @@ -index eb26367827..1f92250f5e 100644 +index 1354cc9619..5f1a179df3 100644 @@ -128 +129 @@ -@@ -120,10 +120,17 @@ mlx5_get_tx_port_offloads(struct rte_eth_dev *dev) +@@ -118,10 +118,17 @@ mlx5_get_tx_port_offloads(struct rte_eth_dev *dev) @@ -148,3 +149,3 @@ - if (!config->mprq.enabled) - offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; -@@ -971,7 +978,14 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) + return offloads; + } +@@ -970,7 +977,14 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) @@ -166,15 +166,0 @@ -diff --git a/drivers/net/mlx5/windows/mlx5_os.h b/drivers/net/mlx5/windows/mlx5_os.h -index 6de683357c..8b58265687 100644 ---- a/drivers/net/mlx5/windows/mlx5_os.h -+++ b/drivers/net/mlx5/windows/mlx5_os.h -@@ -22,4 +22,10 @@ enum mlx5_sw_parsing_offloads { - MLX5_SW_PARSING_TSO_CAP = 1 << 2, - }; - -+enum mlx5_tunnel_offloads { -+ MLX5_TUNNELED_OFFLOADS_VXLAN_CAP = 1 << 0, -+ MLX5_TUNNELED_OFFLOADS_GRE_CAP = 1 << 1, -+ MLX5_TUNNELED_OFFLOADS_GENEVE_CAP = 1 << 2, -+}; -+ - #endif /* RTE_PMD_MLX5_OS_H_ */