From patchwork Thu Nov 25 20:20:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 104706 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 2591EA0C52; Thu, 25 Nov 2021 21:21:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4DA140DF5; Thu, 25 Nov 2021 21:21:09 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2051.outbound.protection.outlook.com [40.107.236.51]) by mails.dpdk.org (Postfix) with ESMTP id 8E5B140140 for ; Thu, 25 Nov 2021 21:21:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pom1HjFtYhZ5Udu3G9Z6T8o3tb7Wg+HuVvRDPg3eNyh/18akpD5XAL1rk6mm1xTJftn7543C/6cCvES5V1/XaOpDPWiaIx9+yxu6RSJqYBNTOA+4ZGItp/ViY6qsTHo3/zaQpYWQ6mOtcY0e2Zt8l5BBoZDZicM9SsrSxHpkliNpSxgvEVHLIOA99GgkuXNKRVIk8WZPLd6ZPyRFUYMR5XHTElfihdqxiP2YUkq1UKLXnT5A0dU/jL8YJykAf9pOt6xalD5X3rkQHmqaOGS2ctN5AJss2OxdFMVHCu0z+DeJoMT15pKUNLHrojGfVBhaobUzJ8dEcFRi7KpuPHRumw== 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=gpN6W/+DgdVg6YpgKM10x4dAf9aY1Xsb5Ue3MNy7yOM=; b=ITZbMcsYtoBuZdeJOjYmAYNrc2TZJsv3pegNNtik9WEMkV3Bas7acnC9uw7gb7pxH8fCgFSCP1ochDQZcPAB7r5nRfyX7BGtXsDi1PuQmQsQ7+jL0YHXDVa3wTNIF3IXwW9Nqnd3PfWsw42k6i1hHaw/PjRFd1UrxSSLJEgq1Bmh+6zLSBlja/zwP4scMHNyqrXsfGa2GvU/MuaGn2eziq/0w8WZqP9h5gbf6XEIiLf4BC03hod14mg296VYKP+nt9esIMBePpyZ+rlm6KROSBEmJZbA3ItiE6iVL4EgKShA+qph51yLj1n/g27Pn4tX4GQ92zM0twASKjm+1UkPWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=gpN6W/+DgdVg6YpgKM10x4dAf9aY1Xsb5Ue3MNy7yOM=; b=QIHBWkEq+uNGoKJUVFnOYXoe0Q/VV3Ok4XfOoR8QBFVCUU7iSui3ZgSUubgEiRyGGh45eR8Ct4KCk18n/R9CyR4ntXFRd8JIES/37Lk62kCpEIyQojEEX8cW1ct3UR+fhzQL6AaGpXlp+VesNJIYuoVNd3xYFi8BsERgP38nKFUO10Yp8+ksW2DKw/+OXVEf+UBoe9Z2tNT4C2I2HYLyDW0wSQ1QVhBSqYGwx2Y2CEurF6v4Lz1NfpSQ3kiCxLSMqKasQFW8UO/ba0j2RtC1otRdpKsOzVHu6jMBHgC9JCcHgN9A+k6qaD/Vi1Z6K9H2pKGzhBmgsbU5fuxblAOYyQ== Received: from MW4PR04CA0159.namprd04.prod.outlook.com (2603:10b6:303:85::14) by MN2PR12MB3517.namprd12.prod.outlook.com (2603:10b6:208:ab::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 20:21:05 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:303:85:cafe::6b) by MW4PR04CA0159.outlook.office365.com (2603:10b6:303:85::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22 via Frontend Transport; Thu, 25 Nov 2021 20:21:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.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 CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 20:21:04 +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; Thu, 25 Nov 2021 20:21:02 +0000 From: Dmitry Kozlyuk To: CC: Thomas Monjalon , Raslan Darawsheh , Viacheslav Ovsiienko , "Matan Azrad" Subject: [PATCH] common/mlx5: fix MR lookup on slow path Date: Thu, 25 Nov 2021 22:20:44 +0200 Message-ID: <20211125202044.3483813-1-dkozlyuk@nvidia.com> X-Mailer: git-send-email 2.25.1 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: 789d4bd6-1242-4629-985a-08d9b0511b54 X-MS-TrafficTypeDiagnostic: MN2PR12MB3517: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1169; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t0bIwompnrOeIjN1F5y+r5+4sG+8CH8wVPxcz7Vq14AMkk97KagTt2e1js1+uGpn6aGvFQhG3Uc2HRVcdY9EIpWdxft+3iyGVN7PbXRUfMBtpQUzAx9xJNpIxf0bMFktFwtZw2UbAtru5g9EAkSOII0jCILtKZiNAm0ILNdsbJP6VearqHBL2SWa7Uw67Xzx44RdiLNu8ZbWqplBkuKufme/USGNlT4vCRDaI0Dao0M1CTo5V6aqgHOK1KEIDr1TKi3tborpeQTC992o+DhP6qGVNFS9BXSAjGQDFxNzuwEYOY+VS8pG9OpZCyXJDj7FHcUKEUS0gQnW+zlqrU6jfP/Y8+RlsY97zTSMwYnJvMUBJXgYHS3PwsDHNMa0/2bH8CxGeorb3COubU70U/ZpGvgKdsHh7wi0Od3KZw35Pm2aRdrd7SoFMEYDy+DJo16gUUn8+j9warDS+IiDpabtQIu0D76hP57/avwmXR5HC6GKz11UuOzUrK2ePZ4rugDkLqNEMwp0z2mBgRLsN82RpHkrE8UuL9CsggKJM3v66oI0z4LwKlMRYbtI9Daif4qTjZShqNg62FUH7YU9oWO8c/TY6j2dVY48MVr5a9zhjWcNmXe3tzdPgOwOQxiidBc4DYoS2QyeqkCsRxTK9WYXe7IgDf0+66r+FAvSJyWin7ZZVPP2APFDYKU2jeP04jIICZ/IAcrUqC8Twsj2hyf/fg== 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)(70206006)(83380400001)(70586007)(356005)(336012)(36860700001)(6666004)(26005)(8676002)(16526019)(186003)(426003)(1076003)(4326008)(36756003)(86362001)(6286002)(2616005)(8936002)(7696005)(107886003)(316002)(2906002)(6916009)(82310400004)(55016003)(7636003)(54906003)(5660300002)(508600001)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 20:21:04.6034 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 789d4bd6-1242-4629-985a-08d9b0511b54 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: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3517 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 Memory region (MR) was being looked up incorrectly for the data address of an externally-attached mbuf. A search was attempted for the mempool of the mbuf, while mbuf data address does not belong to this mempool in case of externally-attached mbuf. Only attempt the search: 1) for not externally-attached mbufs; 2) for mbufs coming from MPRQ mempool; 3) for externally-attached mbufs from mempools with pinned external buffers. Fixes: 08ac03580ef2 ("common/mlx5: fix mempool registration") Signed-off-by: Dmitry Kozlyuk Reviewed-by: Matan Azrad Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_common_mr.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 01f35ebcdf..c694aaf28c 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -2002,21 +2002,29 @@ mlx5_mr_mb2mr_bh(struct mlx5_mr_ctrl *mr_ctrl, struct rte_mbuf *mb) dev_gen); struct mlx5_common_device *cdev = container_of(share_cache, struct mlx5_common_device, mr_scache); + bool external, mprq, pinned = false; /* Recover MPRQ mempool. */ - if (RTE_MBUF_HAS_EXTBUF(mb) && - mb->shinfo->free_cb == mlx5_mprq_buf_free_cb) { + external = RTE_MBUF_HAS_EXTBUF(mb); + if (external && mb->shinfo->free_cb == mlx5_mprq_buf_free_cb) { + mprq = true; buf = mb->shinfo->fcb_opaque; mp = buf->mp; } else { + mprq = false; mp = mlx5_mb2mp(mb); + pinned = rte_pktmbuf_priv_flags(mp) & + RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF; + } + if (!external || mprq || pinned) { + lkey = mlx5_mr_mempool2mr_bh(mr_ctrl, mp, addr); + if (lkey != UINT32_MAX) + return lkey; + /* MPRQ is always registered. */ + MLX5_ASSERT(!mprq); } - lkey = mlx5_mr_mempool2mr_bh(mr_ctrl, mp, addr); - if (lkey != UINT32_MAX) - return lkey; /* Register pinned external memory if the mempool is not used for Rx. */ - if (cdev->config.mr_mempool_reg_en && - (rte_pktmbuf_priv_flags(mp) & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF)) { + if (cdev->config.mr_mempool_reg_en && pinned) { if (mlx5_mr_mempool_register(cdev, mp, true) < 0) return UINT32_MAX; lkey = mlx5_mr_mempool2mr_bh(mr_ctrl, mp, addr);