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 EA5BD41D8D for ; Mon, 27 Feb 2023 08:15:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E58CA40ED6; Mon, 27 Feb 2023 08:15:13 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by mails.dpdk.org (Postfix) with ESMTP id E4D8F410FB for ; Mon, 27 Feb 2023 08:15:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HjJndDZU7XYGiPNWbxRb1jDijYZcbBuuEns25Oh5ODulvZI25OsAFTS7uZRUCtsYgUOExTP+Ed75pIoiw7NWbg/8vAca8jKaXSfexCELDdqudxPLbXnMg6SSxNFcGErBXlLd5qfGCYOARYH4hSz60Qtf3gvqWzI8Qa5ocJuiwWPhN/n+9u5feYh1C257+BKTlbAZ3tflzhQK/sWGsVbW9VemDkCEnLqiV2f/orfkjRHYtg99PDQMDwuOIwm2fEeGP1V5hgKYa20K6KX7q0elB1Z/fqbQci7ryUcfA7SeLT+KUWoA+WWY0mUYgT4K2tT9Vv1AzUx5Pq5se2fNg/+9+g== 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=IcyMl7Jv8dm9vpiI1uGvViya8Odp+rvpH23/JuHcwRc=; b=fpiIFTinHgtZOLvwQDQQSIPHpwfsEEY8KC5Eik2JIrmqxV3A/TXWhKJnO500zuM6Wtd9gIDNhkWieAyHIqa5Bx1pO/adXS7muNuWf+l61+JGTCHCS48AuItr5DOKdQizpTyxrXXPwnvfJxIInLW6JaLQK6ovIcptWq79Z66HxIWGpuKWlzd1q8gTiucaW9s3HKL/uH1ty1ebOGkcW4MP+4pj5dRiJTDkcXrI8zCk4B/1IyctJ1+ojnY2DOl1HY8FYdxowJkzBAog9Ty25kUwf0RztzaQkQUQGskg7RbfaciK6uhRtC3F6fh8rmb5cMd3zJT7XqLwWekxJJAu2tB+vQ== 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=IcyMl7Jv8dm9vpiI1uGvViya8Odp+rvpH23/JuHcwRc=; b=m6c1jcvFLXNAoUAJ8VpDrnmbtMPulrKOScv789l9oznP3BGCehLmEIdG3oe3HPF/0rRB1MbMmNa7qPKWZ4mqPOPB7EXAT45Jh0UX4/LcYC9eDcUcdXo+LtC1F5fGRybYa931Sx7J4ZhOiz7hMfJwjNdVMb2cPm6durIzb8e4JuGGT/0rmzcgGpccAuk68MEMBFXzITuQQRXmJleFNhL3G6WBKlLeevw5mz5Od0ejRs3MiYkemghLGwaabMaK1bb2QtFiC/uQtWLuBwh/Gqq/gY2VWeC3YlM/t3McfMvxaHog1HFIMvmfMjdNp1v2qVz+yYCPJbSL0omlwfeJ6wmBpQ== Received: from BN6PR17CA0036.namprd17.prod.outlook.com (2603:10b6:405:75::25) by BL0PR12MB4849.namprd12.prod.outlook.com (2603:10b6:208:1c2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:15:10 +0000 Received: from BL02EPF00010209.namprd05.prod.outlook.com (2603:10b6:405:75:cafe::b) by BN6PR17CA0036.outlook.office365.com (2603:10b6:405:75::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:15:10 +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 BL02EPF00010209.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:15:10 +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.36; Sun, 26 Feb 2023 23:14:54 -0800 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 26 Feb 2023 23:14:51 -0800 From: Xueming Li To: Alexander Kozyrev CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix error CQE dumping for vectorized Rx' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:35 +0800 Message-ID: <20230227070107.15664-127-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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-TrafficTypeDiagnostic: BL02EPF00010209:EE_|BL0PR12MB4849:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ab167cb-8939-4f64-696d-08db18925cbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uFP9gKTgbG3DffHpxwe97fpfuNhzBNFkVUkFdrI/TjKJrOzmof2WvEXS9Hf0nKgkHSzIfl0xEmPm00uQiWoErMW7bQvnjDKD9aAJPaMQ8bMfxxPwrjK5iRqyOVPHqnmeBPU/qvCLHejQh7L9A1010lei6WdMwEv5HR3/d9Co4u1n/4j1BDYSjMFF4UfJoWJUZqUNXNgmtbMb15l97aOTFziGygiOs1H+M5HCu10x6ENF+1APKuEtZiVKnNFubg9mwXj6h/YAiV9Za5xSU2FZfQQfDrm8zjr9xXqm4EVGRGPBXQZ3sclR0DiJdq3sqewT21LLUQ/ePcR7QfvfXHK0H9ax3yVZJeFzc3PXw0RQkysKROOzld2WbtQWqrS4Kcx/B70HMLgwNK6f+5JbDro6gyEKKP0kIoRxyyzI3Ap/XGspGjWKdoMtycAurXrduPY3wNQAzxMe0XXdh5bN3U9ehSjIXYLW99k6ITVoqYJwgnEYkEYMgyS1BWASM6LzTTf8r3UrmHNgHVFS9QJ32YZfk+Fy/DYO7PIqVoLD6uWtKWRnYbiORrXis0W3dATt7ZELtP9uDRZVg8nASrgkbd9wV4/dQF72KP+KEV7nEsYDt/4TdIOcQ2pGt5NLe/ISmwSNTLTw1OPU9pSL4WVn1YSDCCjgJFqeP8D/nfr93JyrnaHgjFotI7TPOsHrPDUr7q6Qsee0l8g+Q4Q1dKzqTVqPD5DalXAWgnfE0eQeL849UkvMUKrTui6eMbWvPN3tr7XB 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:(13230025)(4636009)(136003)(346002)(396003)(376002)(39850400004)(451199018)(46966006)(36840700001)(6862004)(8936002)(2906002)(5660300002)(41300700001)(70206006)(70586007)(4326008)(8676002)(316002)(54906003)(6636002)(37006003)(478600001)(966005)(7696005)(6666004)(36860700001)(426003)(47076005)(82310400005)(26005)(6286002)(16526019)(186003)(53546011)(1076003)(336012)(2616005)(40480700001)(86362001)(7636003)(82740400003)(36756003)(83380400001)(356005)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:15:10.1077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ab167cb-8939-4f64-696d-08db18925cbd 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: BL02EPF00010209.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4849 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=47f5a0e5f344238a631891594827f21340b5759e Thanks. Xueming Li --- >From 47f5a0e5f344238a631891594827f21340b5759e Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Fri, 27 Jan 2023 05:22:11 +0200 Subject: [PATCH] net/mlx5: fix error CQE dumping for vectorized Rx Cc: Xueming Li [ upstream commit 633684e0d0defdd7649132797cc14329f71f678c ] There is a dump file with debug information created for an error CQE to help with troubleshooting later. It starts with the last CQE, which, presumably is the error CQE. But this is only true for the scalar Rx burst routing since we handle CQEs there one by one and detect the error immediately. For vectorized Rx bursts, we may already move to another CQE when we detect the error since we handle CQEs in batches there. Go back to the error CQE in this case to dump proper CQE. Fixes: 88c0733535 ("net/mlx5: extend Rx completion with error handling") Signed-off-by: Alexander Kozyrev Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rx.c | 16 +++++++++++----- drivers/net/mlx5/mlx5_rx.h | 3 ++- drivers/net/mlx5/mlx5_rxtx_vec.c | 12 +++++++----- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c index 917c517b83..7612d15f01 100644 --- a/drivers/net/mlx5/mlx5_rx.c +++ b/drivers/net/mlx5/mlx5_rx.c @@ -425,12 +425,14 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq) * @param[in] vec * 1 when called from vectorized Rx burst, need to prepare mbufs for the RQ. * 0 when called from non-vectorized Rx burst. + * @param[in] err_n + * Number of CQEs to check for an error. * * @return * MLX5_RECOVERY_ERROR_RET in case of recovery error, otherwise the CQE status. */ int -mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec) +mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec, uint16_t err_n) { const uint16_t cqe_n = 1 << rxq->cqe_n; const uint16_t cqe_mask = cqe_n - 1; @@ -442,13 +444,18 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec) volatile struct mlx5_cqe *cqe; volatile struct mlx5_err_cqe *err_cqe; } u = { - .cqe = &(*rxq->cqes)[rxq->cq_ci & cqe_mask], + .cqe = &(*rxq->cqes)[(rxq->cq_ci - vec) & cqe_mask], }; struct mlx5_mp_arg_queue_state_modify sm; - int ret; + int ret, i; switch (rxq->err_state) { case MLX5_RXQ_ERR_STATE_NO_ERROR: + for (i = 0; i < (int)err_n; i++) { + u.cqe = &(*rxq->cqes)[(rxq->cq_ci - vec - i) & cqe_mask]; + if (MLX5_CQE_OPCODE(u.cqe->op_own) == MLX5_CQE_RESP_ERR) + break; + } rxq->err_state = MLX5_RXQ_ERR_STATE_NEED_RESET; /* Fall-through */ case MLX5_RXQ_ERR_STATE_NEED_RESET: @@ -507,7 +514,6 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec) rxq->elts_ci : rxq->rq_ci; uint32_t elt_idx; struct rte_mbuf **elt; - int i; unsigned int n = elts_n - (elts_ci - rxq->rq_pi); @@ -628,7 +634,7 @@ mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe, if (unlikely(ret != MLX5_CQE_STATUS_SW_OWN)) { if (unlikely(ret == MLX5_CQE_STATUS_ERR || rxq->err_state)) { - ret = mlx5_rx_err_handle(rxq, 0); + ret = mlx5_rx_err_handle(rxq, 0, 1); if (ret == MLX5_CQE_STATUS_HW_OWN || ret == MLX5_RECOVERY_ERROR_RET) return MLX5_ERROR_CQE_RET; diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index e078aaf3dc..4ba53ebc48 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -286,7 +286,8 @@ int mlx5_hrxq_modify(struct rte_eth_dev *dev, uint32_t hxrq_idx, uint16_t mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n); void mlx5_rxq_initialize(struct mlx5_rxq_data *rxq); -__rte_noinline int mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec); +__rte_noinline int mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, + uint8_t vec, uint16_t err_n); void mlx5_mprq_buf_free(struct mlx5_mprq_buf *buf); uint16_t mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n); diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c index 0e2eab068a..c6be2be763 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec.c @@ -74,7 +74,7 @@ rxq_handle_pending_error(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, rxq->stats.ipackets -= (pkts_n - n); rxq->stats.ibytes -= err_bytes; #endif - mlx5_rx_err_handle(rxq, 1); + mlx5_rx_err_handle(rxq, 1, pkts_n); return n; } @@ -253,8 +253,6 @@ rxq_copy_mprq_mbuf_v(struct mlx5_rxq_data *rxq, } rxq->rq_pi += i; rxq->cq_ci += i; - rte_io_wmb(); - *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci); if (rq_ci != rxq->rq_ci) { rxq->rq_ci = rq_ci; rte_io_wmb(); @@ -361,8 +359,6 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, rxq->decompressed -= n; } } - rte_io_wmb(); - *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci); *no_cq = !rcvd_pkt; return rcvd_pkt; } @@ -390,6 +386,7 @@ mlx5_rx_burst_vec(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) bool no_cq = false; do { + err = 0; nb_rx = rxq_burst_v(rxq, pkts + tn, pkts_n - tn, &err, &no_cq); if (unlikely(err | rxq->err_state)) @@ -397,6 +394,8 @@ mlx5_rx_burst_vec(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) tn += nb_rx; if (unlikely(no_cq)) break; + rte_io_wmb(); + *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci); } while (tn != pkts_n); return tn; } @@ -524,6 +523,7 @@ mlx5_rx_burst_mprq_vec(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) bool no_cq = false; do { + err = 0; nb_rx = rxq_burst_mprq_v(rxq, pkts + tn, pkts_n - tn, &err, &no_cq); if (unlikely(err | rxq->err_state)) @@ -531,6 +531,8 @@ mlx5_rx_burst_mprq_vec(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) tn += nb_rx; if (unlikely(no_cq)) break; + rte_io_wmb(); + *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci); } while (tn != pkts_n); return tn; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.987426800 +0800 +++ 0128-net-mlx5-fix-error-CQE-dumping-for-vectorized-Rx.patch 2023-02-27 14:08:40.909237000 +0800 @@ -1 +1 @@ -From 633684e0d0defdd7649132797cc14329f71f678c Mon Sep 17 00:00:00 2001 +From 47f5a0e5f344238a631891594827f21340b5759e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 633684e0d0defdd7649132797cc14329f71f678c ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org