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 6B414A0C4B for ; Tue, 12 Oct 2021 14:46:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C9DB4117E; Tue, 12 Oct 2021 14:46:39 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2079.outbound.protection.outlook.com [40.107.236.79]) by mails.dpdk.org (Postfix) with ESMTP id 5E0A141135; Tue, 12 Oct 2021 14:46:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lecPTm6CG++nVGVYC5AwtIKkEagjSx3jsQO64Jv/DZWs11JDWW3csvYNcEbb4u8oC1BB6OntsvBMWD4fQay569K4wuchpNefTcTAJojdMhan21XFwwgGHuMp6khIlw+qN279nRrrtkyKBaUnRXcYZwZlfAzbniZAkuz6kOXpu7J5wyQDfXMm0cW2rxXFN+wTMeVFhwSVPE2Q4zISh8MbYTyBLRqBUQVg16IohlBQoKbg875mOATfxMqJsldk2OPsGyrKBz8kSqWD97NmZEGakEaf/kl+TarfLc148a2Eel3uYo7vw0/s8LrJiX8bx2ygeWQR4++gKFfAQ/eF50W3pw== 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=lWrxiisqFvxPR/b0roPu7DSLZIYcmW/hK016sX7+y3A=; b=UZCDkt5PE4i03/pjp/+3M0RIh6IOPpZ+W2A89RW5Qa2SG0N23o0P/UKt6JbCQMlhZ+n7xF3Ch/3IM74Cjz7lckGcok4VBETSm5eqncyWGwIPDkH/65u4f4BbDWVVYwy4PWnzH6Rf/1d69qwPii5e4kqJ9UAK9J8u8RV83cEqTN5ntEQahhKZ18LLzTi1Q40G10cCPjI/8ACj3Oy0LInS/YN3X4f3o7Rw23IpBMELhVQqCRWrNVriAysjBb7YvvKOTsLa1xPMp3Khf3125gChiTlkj2WXvVFZV4rAF7WbhUmvRFKoh3323djDwiHIAWulZZ76eP3von3jEo9xJLj6qQ== 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=quarantine 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=lWrxiisqFvxPR/b0roPu7DSLZIYcmW/hK016sX7+y3A=; b=Vifxxnj8XTE88AAWhZXJTBvF60ZKXzHZeErUF0LgzEhVsc7YoxZM+oOqUBqLL5TfPSQeqpPX4JDOvp0IDAW9yNKxyvRAa/okIVPiiBHPJhJrQMvcIEf75yVfqugX/OXzIyZibUYegkcuJdQnqUMm7PIVqN6688lEn7kl0XuI01wKGyhBjXoFBs+Zayiyr/407qkFDi+ZxBDDm2SETnHcDvi4jfwwL0LvlxsPMKNb6ggO/eboum9AvJiTw+SyLxxNFJnmpBpzk97CZcPc9n5uSaDMokOxJoPfyV812oO5hYSwD9KZZ9j4pFZn8r6mqte5DnzZuZ91j2wSWiJ5/SHyEg== Received: from DM6PR02CA0146.namprd02.prod.outlook.com (2603:10b6:5:332::13) by MWHPR12MB1248.namprd12.prod.outlook.com (2603:10b6:300:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Tue, 12 Oct 2021 12:46:34 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::9d) by DM6PR02CA0146.outlook.office365.com (2603:10b6:5:332::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 12:46:34 +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 DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 12:46:33 +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; Tue, 12 Oct 2021 12:46:22 +0000 From: Tal Shnaiderman To: CC: , , , , , , , , Date: Tue, 12 Oct 2021 15:45:42 +0300 Message-ID: <20211012124554.21296-2-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012124554.21296-1-talshn@nvidia.com> References: <20211012124554.21296-1-talshn@nvidia.com> MIME-Version: 1.0 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: 9dd00dba-fb03-4922-520b-08d98d7e5299 X-MS-TrafficTypeDiagnostic: MWHPR12MB1248: 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: Hkno35KMk8gMTqsXN8k2mdkwt61dehUyMy06/wz1LOCBBoyGho4LKDDnhF51OkuM74XMYVuj4jN3o9c7135GqT+jm7gmIhFRq16tWRMCOAynggi00O2hbqTzpMFCBRTzp5xIdnVc6mAUWsjnOyCYpuBI8qAACEh+ux2lc9ddS1VOEjm+hnaP/wYKc/kAHwyo6tXCfj6IpMLw68ybBWeTAcwkOQ8Y5+GWfDG48wgzwytVJAXph4N6Fh1e9/L0uYqVx12qYSUSnsd2xYpemLYqFqczXky3tx1I74hT1Pv6+BW/bdUX7apUi93mVSBnf0Cf3GQg/vCyQop7fH3/R4ba1E90ENnyDnVA5S0rBG1iHnFc/93D+rE6c48cBHbDzednwA1FeBZKeWhASpoQ+qtqJH8XzHD02PWQdx9ulYL/eQDhCz6VDncGGIZaw4/CMeEkx5WolCVjrcK+t8IhYyDzgxodQ9T2NQPz8ynaVXR5/bF08rY89YykFOtxt1lad4DEx9tTzeqFaJDoEP0YsWq4GiNRrOXMUtkf24jvW8XMSOTUVY9keKdiTcgUFXBoJMNuvI+3ywTZEy99D6r50qyOJJlgz4dOKUleyWfUDVadbn2l5syhocLs6O+C/a5WMVA9PXHHDY5gsaBfKwpIA/TpvtQhVVMfDYs00Yw+OUF4nC20UZCP6xbaabn5ztiKcVwKuhIFSVb6D6BdJcdqaB7Xm39PZn4WNYB+iF/PVqGAr7Q= 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)(36860700001)(83380400001)(54906003)(36756003)(186003)(7636003)(4326008)(316002)(1076003)(26005)(508600001)(16526019)(2616005)(8936002)(8676002)(356005)(70586007)(336012)(6916009)(2906002)(426003)(5660300002)(86362001)(6286002)(6666004)(82310400003)(70206006)(7696005)(47076005)(55016002)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 12:46:33.9513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dd00dba-fb03-4922-520b-08d98d7e5299 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: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1248 Subject: [dpdk-stable] [PATCH v2 01/13] net/mlx5: fix software parsing support query 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" 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 Tested-by: Idan Hackmon --- 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)); } /** -- 2.16.1.windows.4