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 0CA82A0543 for ; Tue, 21 Jun 2022 10:03:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07BC240151; Tue, 21 Jun 2022 10:03:54 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2076.outbound.protection.outlook.com [40.107.94.76]) by mails.dpdk.org (Postfix) with ESMTP id AB4EF40151 for ; Tue, 21 Jun 2022 10:03:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eR+nIYHXkl3j1xGqmOQoA/DNBGs7RtrVV12+klQD6XWBoh5Kmb6CrtTC7XZ4Yk2nlcwtGGrXFfR34mr28kY/ZKXV+7awg7HpFiCvOzk7SEYM6QT+O5Q6GsvvbIRuTv4aEdRO/zOUw6GRNl8HsSCDQZkJskcyvkjsVNpFC472Wvtg7yF/XpkZtP39yQEh/tmwdNkmQ2AJDBMkXSAIgZRLy6pJbz/7i+0reBt9o/WkXhpcvLmTFv5+cOoUpAIQST5lvvPs/eOlRvARxzn0m6LCvYOg+XIR2TnBWrY2RU8uNIJcrGFD3Jl/BK04rXA95dMcO6Nd5+znN+RXfwcZYWzAlQ== 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=HmC3F8yJHIsPiJuYsGDKhW1URw3PMCGL/8vCQY6dYaQ=; b=W9C3szz+zwXholS7m84RLG3IJk1mEu+qpR/ZUlETfAtRmPJHHzDfVxO4SrwHzfvXWDgs79YHZT4vLM/qxOwDSAu1v+4h2tZ5GKuHqFxtMkBnWK8OzwU+0PQHUDDa1pL5coVAEhXnrmpHis31P0GrKYVZRs+57pjh5pMClV+4LSQiTfLLLgT98k7tzoSkICCfxQMcwTKk9QaDRX9afA8+1rfHWPf/JyL4flbBSVfjBfZyThuJowwOYDe15Cb7UWI+a9Mxj6+1Vy7wzLwMFg8ppsSWcd68HMTT/4Qf7pFJUASaemjVXgjHcD0mi3JNiF8zj+dtYB33mkVETQ2T3XBNzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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=HmC3F8yJHIsPiJuYsGDKhW1URw3PMCGL/8vCQY6dYaQ=; b=RxGksxR1gJAKax18jQI2AdBqOlpALd7oDFl7kCSLlFqDn5hnYmsH7ay7M5I/NCkWqKda0Wo3w70I1JibC4vCO6BDMXenWXxQSPC8OCYqSKrRPeffOHIy7BGHNkfIp8UzZDlGgAMCRKvVV8YIyXzPhJfwBF4A1vCGTDfMN8TRrBOYaL7llZoJBbhZY4K5312/wzNBXkayhO+hheJzqFWRnNXxMS4dprBv1vWuGi8tvacU07Wdj9eymCblgVfljR2QwsKBZZ8BVKfzqqz3bBUQTNtxmgVOnaCgnutx50+iHAGwk0KdepVcpwQby/F5zk9ZuRhfwskhWg/JlzO4q1+ekQ== Received: from DM6PR03CA0058.namprd03.prod.outlook.com (2603:10b6:5:100::35) by BN8PR12MB3586.namprd12.prod.outlook.com (2603:10b6:408:47::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.13; Tue, 21 Jun 2022 08:03:51 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:100:cafe::ff) by DM6PR03CA0058.outlook.office365.com (2603:10b6:5:100::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:03:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:03:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:03:50 +0000 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.22; Tue, 21 Jun 2022 01:03:48 -0700 From: Xueming Li To: Dmitry Kozlyuk CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix Tx when inlining is impossible' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:15 +0300 Message-ID: <20220621080301.2315720-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a99a09a3-169a-4b3c-4dcf-08da535c93bf X-MS-TrafficTypeDiagnostic: BN8PR12MB3586:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j9ENWn4DqMl2icnxdQkypfCmobPCPeiN+2yV27wQu7Xnt/66oTPVWrPt/XTtaKYf6r/kzHimGAZffwmbdlLc3Im+rhvfu7ldg04RTxaay2LVEFGMaEHTtYOHxRwOqHQ4gMnz3WPzcc0rb6+zlFWrXOUmHXigheJ/SrK4XHoIlmDAok+pv9fxmpOCgxp4bUp1vyb8DNOOC8AZBl3M8GK5j8R6DvSQEs0jeoseJ9qv7ZfGtk93AJkDsBcTG2F5/5wC6Eed2GxflGSXEQRvqvqsk239G1lXkKQDnOOU/sqAWMQaQr7R3wV2RAe3K4/oVPU4s81JiNcZI8P1oFwMIbQHGmjz5TExL005m+2X4M3NPQahDhro0yRYlcVbEajISGzaMfGijj/AbEJxAkTm8l6Olzq3dVTzKUjDjcYmS0QZPB/3DI6ZZftli5gOVKdv1K9jNEqAkMV+CjF0m9xhcw2SoDAgP5DNpJOCjHvTD1eZVWgyV0zEGqHFKmu0VO7ncncZkdbkGn9dPzMGgmGNq/T/kxW7sN5Li2G+3i3h+DDL/Xa40bMD6wJhRGvGmLiqKeCDNT4NKoxmJYRhawDsBXtEIkp01zPyyNbRNR5YsIZ9EX5bdg9c47F+AOniFqbL1FcPm23Cn4sQfIgqtVzkZA9JpVLAkUw5/3vhtbHHRHUzlDtweJbLPWdZ+9h8bSLJQQSEK7pXl659drVHaXz8YdQv/ZKx8EhV6L36k7PpU7ERANCR+k8XTiIYEGWilSfLVhxljnDxNNFZWtRhmGnlj3eczp2SeNJZmZdhiJ+wiN/0EEjdrFFZOBZ5/18VaycU02d090ThU+OlPgt1lir88yNumzVxOUs6Zsryi9ovNaPzdJA= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(396003)(136003)(346002)(376002)(40470700004)(46966006)(36840700001)(86362001)(40460700003)(40480700001)(55016003)(6862004)(82740400003)(2616005)(966005)(8936002)(41300700001)(37006003)(54906003)(316002)(6636002)(356005)(82310400005)(36756003)(81166007)(2906002)(16526019)(6286002)(83380400001)(478600001)(186003)(8676002)(336012)(426003)(5660300002)(1076003)(47076005)(4326008)(36860700001)(7696005)(70206006)(53546011)(26005)(6666004)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:03:50.6137 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a99a09a3-169a-4b3c-4dcf-08da535c93bf X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3586 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 Hi, FYI, your patch has been queued to stable release 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. 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/e8995a254012b4cfde71e0df98eea81741ab4695 Thanks. Xueming Li --- >From e8995a254012b4cfde71e0df98eea81741ab4695 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Thu, 31 Mar 2022 17:38:41 +0300 Subject: [PATCH] net/mlx5: fix Tx when inlining is impossible Cc: Xueming Li [ upstream commit e2259f93ef455c75bfeda9a7349689b7e9be5981 ] When txq_inline_max is too large and an mbuf is multi-segment it may be impossible to inline data and build a valid WQE, because WQE length would be larger then HW can represent. It is impossible to detect misconfiguration at startup, because the condition depends on the mbuf composition. The check on the data path to prevent the error treated the length limit as expressed in 64B units, while the calculated length and limit are in 16B units. Fix the condition to avoid subsequent TxQ failure and recovery. Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template") Signed-off-by: Dmitry Kozlyuk Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 34611ceaec..734c462a09 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -3553,7 +3553,7 @@ do_build: if (unlikely(loc->wqe_free < ((ds + 3) / 4))) return MLX5_TXCMP_CODE_EXIT; /* Check for maximal WQE size. */ - if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ((ds + 3) / 4))) + if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ds)) return MLX5_TXCMP_CODE_ERROR; #ifdef MLX5_PMD_SOFT_COUNTERS /* Update sent data bytes/packets counters. */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:49.697769027 +0800 +++ 0009-net-mlx5-fix-Tx-when-inlining-is-impossible.patch 2022-06-21 15:37:48.964450992 +0800 @@ -1 +1 @@ -From e2259f93ef455c75bfeda9a7349689b7e9be5981 Mon Sep 17 00:00:00 2001 +From e8995a254012b4cfde71e0df98eea81741ab4695 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e2259f93ef455c75bfeda9a7349689b7e9be5981 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ - drivers/net/mlx5/mlx5_tx.h | 2 +- + drivers/net/mlx5/mlx5_rxtx.c | 2 +- @@ -25,5 +27,5 @@ -diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h -index 89dac0c65a..dfa04612ff 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -2070,7 +2070,7 @@ do_build: +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index 34611ceaec..734c462a09 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -3553,7 +3553,7 @@ do_build: