From patchwork Wed Oct 6 12:09:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 100625 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3492A0C41; Wed, 6 Oct 2021 14:11:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 72BD841471; Wed, 6 Oct 2021 14:10:44 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2078.outbound.protection.outlook.com [40.107.243.78]) by mails.dpdk.org (Postfix) with ESMTP id 65CA341465; Wed, 6 Oct 2021 14:10:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYS7IM+Rdb9EBjPlff3oGwaJutV4cMFu0gZ0kl1ZQ7m/hxPPVQcA57VaPfO5kWUo7yDjnnnPl1MvwxTc0gwk5lDQsUqhzbwx6I4pRvwgbus0+5+tvoUsyVOxKXTjh29rNuaU1M2jkczS0GVncaN1x0VEb4xby4gBi1q2WE9MsCZIZeE72v42gGhhbLE7xzwqeYGbGplorp41LUt3cG6AVNLw9PrC4DW5L7ro0KGPbQn+WMS80KGXGZ1i/HzXlkNhZjEz6K8LbioW4ipGrKIZGGg3b5N9Q6k0hHJjwnWQNIOVZUMt7s3wJ+RavIAQbBqJ/qp6WPIa3y7ivF32HxQYBg== 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=od2znx0X2uDqJqH4Gw+AIjA5u3r8L5jqm5vwoX5abPA=; b=hQvT6HcNfegw8ZdMLa5RHBZH5ePj1qalmpOtzQ/PPwntYPcxJ4ro0sfybwrCr1UAHKx+AjXctKkGdHbgQXmqaF4XuI5sdaRJJVz66nOcYUppAU5TtyyQwwJaC0cFygeUoHRqFyvDrE7adDd5ZgysjEpWPrHuAlGzvCdlWTas6U3aDd8G+w8SLjDCEa/EViNJ0wb8Weup/qez6jQ3eSrFGENo//GYxl3Ll2X6GA7+g11XkUuw/cc9mtvdF4ZaGpOGwqPnJPCqxq6Y1amsb2GaKenxGjw3RUYFASkCF8/nfBS3TJDcnPJCwoYKSQ6Byg6c6ckD8LP9Gh7COz8r+ZMmFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine 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=od2znx0X2uDqJqH4Gw+AIjA5u3r8L5jqm5vwoX5abPA=; b=mMt3h7Tcj9tGTBieloEN2/4t8DzfEKxC8RcRObE1bT+brz+0/cHbrQClx1Sgr0phy9IM3Ej99msxo1T+ShJrNn3YYsyhYahZjBxsWCMv06J8oR9ePmBE6blqf5b8CX/GgCHyMOZiLHNJ9aci0eEBY7pRan/47m+PAiNb7rrRrQpkg6RdZSDTOrUiBK+OrHUZMfclJTkw633u66zQkEoJqZARuZSu5KfNyIo1AENA3HCmVgYsehrAcL4t7J3YIVZWKEu1stqo4ijIJtvC8y7TDVGtLhBWxNqqWxqWBFee/PSJGfidGB6cAoy55NYphojF9y22XVRbADYhi0jY4Na4lA== Received: from DS7PR06CA0019.namprd06.prod.outlook.com (2603:10b6:8:2a::18) by BN8PR12MB3537.namprd12.prod.outlook.com (2603:10b6:408:6d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Wed, 6 Oct 2021 12:10:41 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::97) by DS7PR06CA0019.outlook.office365.com (2603:10b6:8:2a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22 via Frontend Transport; Wed, 6 Oct 2021 12:10:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Wed, 6 Oct 2021 12:10:40 +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, 6 Oct 2021 12:10:38 +0000 From: Tal Shnaiderman To: CC: , , , , , , , , Date: Wed, 6 Oct 2021 15:09:34 +0300 Message-ID: <20211006120945.6612-2-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211006120945.6612-1-talshn@nvidia.com> References: <20211006120945.6612-1-talshn@nvidia.com> MIME-Version: 1.0 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: 6439fee0-7921-45e6-1c00-08d988c250d4 X-MS-TrafficTypeDiagnostic: BN8PR12MB3537: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iYb2G9jyC4z/0SgnFUu0Ym6CbWDHHDbvh4V61IBnOERQ01yRpXhmjE24f48tI7gifaq/I551iYxFEdKGjh0zzHJ2/0WWVdXauKYdgHF+/KQx40kpyPiR6P9XYm1uSM12Pxa8XT87ek8OAGoituMKE4qEqR8LpGKu5UtNRTs58wKlHjOgSEL1/wQhnV/7w16KFErtd/KXJgfLc9xZWe71Z8WBkUwRAq4Cc3m9pKyw4quY4ljkOulRJkvtEdcnywssC0tHXsDxjdsFqH+qwpB4PtKNT6kzqDJgcePAN/QoA8hlupgrkaUCwsddZDYxSNK8pe2p1tkQXUVEoSDkjDjEK7C5qJGbbkOvUWjPinQd2Uae5JT3UTFMCO4jjsH0SUnQHmgcp9/2q9XVghdBHSHpnF/iGM4IRFmCxTmVtwoQohg/rxwIUgKo6fBDOt7BfLYzUA/1Yropttkk8fmTWLoaqiDvSAKVaA/+FVz/Wm0p1JbjGhIQAUm1DqkuDrxob6veZdAtvXh6r7zh6imS4Fj3U1oPzC++3iClEFt1UkYByyPb/cNjpewqr4QakeMtYrLX9AzMFoghhjx+z5Ot2TpB6GhJ/zUREqFykPf14Yk9yUcCMJ4uPgHuDVMx9zS0UdBSXXzxJiwsEYm6ikjbDn4DBcA+nuKT7ButSAecsYj+yLasnWjtFA2nie3fFvevOwWDm3iy4TRY6xJGAzy5W4iCUgCSpTYxN/b6wTMv94fUJqc= 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)(46966006)(36840700001)(316002)(336012)(1076003)(8676002)(426003)(36906005)(70586007)(36756003)(70206006)(508600001)(4326008)(6286002)(55016002)(6666004)(6916009)(186003)(16526019)(86362001)(82310400003)(54906003)(5660300002)(47076005)(8936002)(356005)(7696005)(2616005)(36860700001)(7636003)(2906002)(26005)(83380400001)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 12:10:40.9434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6439fee0-7921-45e6-1c00-08d988c250d4 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3537 Subject: [dpdk-dev] [PATCH 01/12] net/mlx5: fix software parsing support query 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" Currently, the PMD decides if the software parsing offload can enable outer IPv4 checksum and tunneled TSO support by checking config->hw_csum and config->tso respectively. This is incorrect, the right way is to check the following flags returned by the mlx5dv_query_device function: MLX5DV_SW_PARSING - check general swp support. MLX5DV_SW_PARSING_CSUM - check swp checksum support. MLX5DV_SW_PARSING_LSO - check swp LSO/TSO support. The fix enables the offloads according to the correct flags returned by the kernel. Fixes: e46821e9fcdc60 ("net/mlx5: separate generic tunnel TSO from the standard one") Cc: stable@dpdk.org Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 3 ++- drivers/net/mlx5/linux/mlx5_os.h | 12 ++++++++++++ drivers/net/mlx5/mlx5.h | 2 +- drivers/net/mlx5/mlx5_txq.c | 15 +++++++++------ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 3746057673..a6542629c7 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1112,7 +1112,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, swp = dv_attr.sw_parsing_caps.sw_parsing_offloads; DRV_LOG(DEBUG, "SWP support: %u", swp); #endif - config->swp = !!swp; + config->swp = swp & (MLX5_SW_PARSING_CAP | MLX5_SW_PARSING_CSUM_CAP | + MLX5_SW_PARSING_TSO_CAP); #ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) { struct mlx5dv_striding_rq_caps mprq_caps = diff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h index 2991d37df2..da036edb72 100644 --- a/drivers/net/mlx5/linux/mlx5_os.h +++ b/drivers/net/mlx5/linux/mlx5_os.h @@ -21,4 +21,16 @@ enum { int mlx5_auxiliary_get_ifindex(const char *sf_name); + +enum mlx5_sw_parsing_offloads { +#ifdef HAVE_IBV_MLX5_MOD_SWP + MLX5_SW_PARSING_CAP = MLX5DV_SW_PARSING, + MLX5_SW_PARSING_CSUM_CAP = MLX5DV_SW_PARSING_CSUM, + MLX5_SW_PARSING_TSO_CAP = MLX5DV_SW_PARSING_LSO, +#else + MLX5_SW_PARSING_CAP = 0, + MLX5_SW_PARSING_CSUM_CAP = 0, + MLX5_SW_PARSING_TSO_CAP = 0, +#endif +}; #endif /* RTE_PMD_MLX5_OS_H_ */ diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 3581414b78..edb4f26d42 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -260,7 +260,7 @@ struct mlx5_dev_config { unsigned int dv_xmeta_en:2; /* Enable extensive flow metadata. */ unsigned int lacp_by_user:1; /* Enable user to manage LACP traffic. */ - unsigned int swp:1; /* Tx generic tunnel checksum and TSO offload. */ + unsigned int swp:3; /* Tx generic tunnel checksum and TSO offload. */ unsigned int devx:1; /* Whether devx interface is available or not. */ unsigned int dest_tir:1; /* Whether advanced DR API is available. */ unsigned int reclaim_mode:2; /* Memory reclaim mode. */ diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index eb4d34ca55..8dca2b7f79 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -111,9 +111,9 @@ mlx5_get_tx_port_offloads(struct rte_eth_dev *dev) if (config->tx_pp) offloads |= DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP; if (config->swp) { - if (config->hw_csum) + if (config->swp & MLX5_SW_PARSING_CSUM_CAP) offloads |= DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; - if (config->tso) + if (config->swp & MLX5_SW_PARSING_TSO_CAP) offloads |= (DEV_TX_OFFLOAD_IP_TNL_TSO | DEV_TX_OFFLOAD_UDP_TNL_TSO); } @@ -979,10 +979,13 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl) txq_ctrl->txq.tso_en = 1; } txq_ctrl->txq.tunnel_en = config->tunnel_en | config->swp; - txq_ctrl->txq.swp_en = ((DEV_TX_OFFLOAD_IP_TNL_TSO | - DEV_TX_OFFLOAD_UDP_TNL_TSO | - DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) & - txq_ctrl->txq.offloads) && config->swp; + txq_ctrl->txq.swp_en = (((DEV_TX_OFFLOAD_IP_TNL_TSO | + DEV_TX_OFFLOAD_UDP_TNL_TSO) & + txq_ctrl->txq.offloads) && (config->swp & + MLX5_SW_PARSING_TSO_CAP)) | + ((DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM & + txq_ctrl->txq.offloads) && (config->swp & + MLX5_SW_PARSING_CSUM_CAP)); } /**