From patchwork Wed Nov 9 16:50:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 119622 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 8B6BBA034C; Wed, 9 Nov 2022 17:51:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2022840151; Wed, 9 Nov 2022 17:51:11 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2086.outbound.protection.outlook.com [40.107.243.86]) by mails.dpdk.org (Postfix) with ESMTP id 3C1E0400D4; Wed, 9 Nov 2022 17:51:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KJvNCZtSKUH043iz1hVUIzy083YEwhjB3rzOBAomT/IuDAFd3pmmvCQkTRQU3+Yml3NOLSLKKeSVkiy1k0t6E7UdXuqxQYZgg774A1VpYLg9EBJiCa5wVmhJ56SlZGHTAMLZJLUiplHjZtkjsUoeWy1k/6/XBm2//tf0AC7qjVLZ99+zS4E6jkA0xBWZXhH92j8XL0Hf/Gsy5bhaRVy0L6kkGS75OIgCrmu2YT/nxybXelIrnuBog+TCRuafRioxSQqYAn6wNvIW6TFMw01kKeb9K1lSd+NtBK/7eP8jCxakErBh2ee3uobarYXZlUlyYSV0ND/8UN0GVXawhv6u2w== 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=jSM8BgRGnTApNP9eVpUyfh+uM8a4FptWVrhKKlPIX0Y=; b=Kg3k9FabWznfQyZsvEfVz+SokUU1DNmJEH67Fw7BdA1MohOWiAaHyInVjU17CutDLIWBUwX4YZ9U+zll9r1TYPKY8tD0qo1gGxWAFf+AtHPpsMPboSi7v1X8F3lBL0Ptjhunbrpi/iIQauWqN34BykhrlGy2rulItXVBAdXZHcW9hTQ0TgKfraQJnm5iKvgMbO6ZkaqNx7m9OsOl8qP+gk1QRfVr3SNHzaEfdg0uKy4Y0Wz6RPGh/s5JJiv3ApJ+trlL2ixiyHX1XOu8GpdaZotlo1EE2mqtUlKjUHKSJ0BNSL6dgmX7DeF4riYWtvBGhWEeEuG0Uldj9xOj+vYlvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=jSM8BgRGnTApNP9eVpUyfh+uM8a4FptWVrhKKlPIX0Y=; b=cyaqy5ontL2Ug/aKm7lfnMZ2AU/X8450qioMUtQR0ry5dir//ClP1xy6i6MJYode4SFMAvYaRjfRyv92W3BPcQqtGZ8f8WuzeQJcbVkxaVLNkoiHwEQz2C3kMA+kuE6n2c1zBya7O6sIe0hgW+mwxYUBW2MkDmAWDqLIV/ZzlPCoBCfcfDkxfd8XK9MZqye0doUkqrew91NY3Ufe3TKXZf4L1jyCMaYUvC0aKv8xXw4liKqZX1OYTj5/DkCy+JI7DzKlhbazCg4BxPz9Wtv24lvjqLhGqb2SRQuiG/y39D9zJUAjudUWAz4khpeoDi1/vcImr5seP1rgzZEI6MWKrg== Received: from MW4PR03CA0133.namprd03.prod.outlook.com (2603:10b6:303:8c::18) by PH7PR12MB7353.namprd12.prod.outlook.com (2603:10b6:510:20c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Wed, 9 Nov 2022 16:51:07 +0000 Received: from CO1NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8c:cafe::9d) by MW4PR03CA0133.outlook.office365.com (2603:10b6:303:8c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27 via Frontend Transport; Wed, 9 Nov 2022 16:51:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT021.mail.protection.outlook.com (10.13.175.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Wed, 9 Nov 2022 16:51:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 9 Nov 2022 08:50:54 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 9 Nov 2022 08:50:52 -0800 From: Gregory Etelson To: CC: , , , , Viacheslav Ovsiienko Subject: [PATCH] net/mlx5: fix port initialization with small LRO Date: Wed, 9 Nov 2022 18:50:38 +0200 Message-ID: <20221109165038.1049-1-getelson@nvidia.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT021:EE_|PH7PR12MB7353:EE_ X-MS-Office365-Filtering-Correlation-Id: 1563eff5-c205-4bcb-35aa-08dac27298f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 18I7ssAy4jyJrAGPDN6lun5DT1T6W76VgiSo8Bg37ZE8yxMB2xauAupJIbz7I+Q77ACBkQoliNsfq9PKSt2hZ6Nk+87JnAh5NmPlkTSLXKBJcdIKeF05Qrom1onE9G21G0mm64eCGBw8WGYJjWUPv3s6WVhxLSzr1BRELrOcDYKlCUlkkhd6Rnb4nnHjPVWXx1Fr27XSBt+v4gzs1Rwb7+lApmN5RMHomPQoZEcQ/nzFDRMfvmy8JlMQkU7PX7WHIWl/Y4e0s9EJHOooP8vYQjStwhtQ4VqlQWnkoQTHEQBF9M3Flc8iUYlUwB+jkuXN2104idRc6iKvIB7j3Hcri0Wb/+G2q9QZCjfDOp2nKlIZCSuNefQg8wBx5NLl3WAudzoe9cITuptZLqX8rPj9N0x6rYMNtEBWkmyJDFaNsvkSRVon1NblAqdC7nyCY9NQOew9RxxlEpetkLzST+cStUzLiStbwotFI179WM9aiI6xIKNyU+i6YEPyo9L7zWn7EO8kLJVqhJHs6jbeEYOFUgDUYtXMM/8y+uMMeLwe+PBzTdzLoS23aj312Be2zE5d55FtnLVxilHarwQYjKUBZvsdOfto1jISKy9j6BuMHGzXn1And1Q5kJ32W3x0OIOTFLc/PSrW5LCVHUZJzDYMKO6wEkqBF45XGjdEu3TNsa71m+wubIKghQvFNI1Yb9PnHVztcsgRcCqMpdkCwluyCG6ajA81nciISeFDCLJWOGHCQIrJP81QJcvuNf6YL7/RHCE+DCMKYWf5evdTwh5cZw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(396003)(136003)(346002)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(2906002)(5660300002)(8936002)(8676002)(6916009)(54906003)(316002)(41300700001)(70586007)(70206006)(450100002)(36756003)(40480700001)(40460700003)(82310400005)(55016003)(82740400003)(426003)(1076003)(356005)(7636003)(47076005)(86362001)(16526019)(336012)(83380400001)(186003)(36860700001)(2616005)(478600001)(4326008)(107886003)(6666004)(26005)(6286002)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 16:51:07.3519 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1563eff5-c205-4bcb-35aa-08dac27298f5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7353 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 If application provided maximal LRO size was less than expected PMD minimum, the PMD either crashed with assert, if asserts were enabled, or proceeded with port initialization to set port private maximal LRO size below supported minimum. The patch terminates port start if LRO size does not match PMD requirements and TCP LRO offload was requested at least for one Rx queue. Fixes: 50c00baff763 ("net/mlx5: limit LRO size to maximum Rx packet") Cc: stable@dpdk.org Signed-off-by: Gregory Etelson Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxq.c | 1 - drivers/net/mlx5/mlx5_trigger.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 0d9d11680b..724cd6c7e6 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1533,7 +1533,6 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx, MLX5_MAX_TCP_HDR_OFFSET) max_lro_size -= MLX5_MAX_TCP_HDR_OFFSET; max_lro_size = RTE_MIN(max_lro_size, MLX5_MAX_LRO_SIZE); - MLX5_ASSERT(max_lro_size >= MLX5_LRO_SEG_CHUNK_SIZE); max_lro_size /= MLX5_LRO_SEG_CHUNK_SIZE; if (priv->max_lro_msg_size) priv->max_lro_msg_size = diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 4b821a1076..71089299b8 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1167,6 +1167,22 @@ mlx5_dev_start(struct rte_eth_dev *dev) else rte_net_mlx5_dynf_inline_mask = 0; if (dev->data->nb_rx_queues > 0) { + uint32_t max_lro_msg_size = priv->max_lro_msg_size; + + if (max_lro_msg_size < MLX5_LRO_SEG_CHUNK_SIZE) { + uint32_t i; + struct mlx5_rxq_priv *rxq; + + for (i = 0; i != priv->rxqs_n; ++i) { + rxq = mlx5_rxq_get(dev, i); + if (rxq && rxq->ctrl && rxq->ctrl->rxq.lro) { + DRV_LOG(ERR, "port %u invalid max LRO size", + dev->data->port_id); + rte_errno = EINVAL; + return -rte_errno; + } + } + } ret = mlx5_dev_configure_rss_reta(dev); if (ret) { DRV_LOG(ERR, "port %u reta config failed: %s",