From patchwork Sun Nov 7 15:29:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 103905 X-Patchwork-Delegate: thomas@monjalon.net 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 C41A7A0C41; Sun, 7 Nov 2021 16:30:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC9D0410E7; Sun, 7 Nov 2021 16:30:26 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2064.outbound.protection.outlook.com [40.107.212.64]) by mails.dpdk.org (Postfix) with ESMTP id 2E29C40040; Sun, 7 Nov 2021 16:30:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=izy3vigNhujZ+CKGu1L+k9BOZjQ/CtiMN1Y0z/GVP8Z38e0GLnQ93kONsfsqTyD0KkcPEn5g3ip7bkdhjmLUFJo1lHzdgP84rTN/sg5n6yK6uDH6T8eE78Bmpk3C0Oeu8kDj5KE1NMRR+3ebKlH5HA9jO4/qGRdcUhC68nPfoOJqos/ed78kb4TxBWSM1k0IUKqA6FF78XCCVwf63Uyf45DdIT/RLibrnTrHGi8PHUhhEUh+9xICPqAacANlAYyDPauDqLZmpxymYAzZOpoVfOIzuTg30YbKrVTMHTNhbbJiZ80d1fFA+jyghLLJAiP4aJqpMVKSw7QbV9cp5LiG8w== 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=G9uUqQq2VOE/9HNinc//JGh2+GIrem6wy6eY4br6hp0=; b=dPzUinqxj/RBxiWr1GCi5FWFMM4XcdZX97akYJ2CswuZgG6p0F5AiaaJHXAtpQFwz4lwwXlzuSZxiYonD9MOZlrGYeGD9mm50RBc/zt7vhmOA9p/yuqiBtE9LhR8Z5n46YE0fmpQip4x7EH7GRBVM2E6s1HvJF9ICfKIbUb8G6QmjHi07fUY91S3ouRcv66lHWAcbkv6H3Jpyo1ZzhcQGh2O6oSfslk5mrqKRswFDlVbbABfzQOUECzm3jKyoLu6VIqxKLQ72e+zmhTzmA/2WDqHDD4TeppIQfleOU4E6/tqBYkQ9RV1im1cyOcJfiWDK/98x7klcDCapDpLYkJPhw== 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=G9uUqQq2VOE/9HNinc//JGh2+GIrem6wy6eY4br6hp0=; b=tgvVcL5Qtqf1EM5MCm12WKgJ+hHvMs00csdiicEtQc1lyz+Yw05wtu/ArhYnDCfYIiiSLeYuUL+IKHUB+vGyY2V/DC5rOTXppLxujOcDeqzMo1y2nToLDdVCzbUBEmLi8tH7gSat8bP8t0gn393omu7C8WMaijUcRSfVIt9+4PCg+o5pV1LwmBX19oLf/AXXLCYi8jsVMj9WKgclYMlBACAaSrwbHOgAeWV7AQyc5s0gPbUW1cAl/NL89vuQrpQeL8LbNN8wMDOGuWfBblygeZ2P95/mV4+2gL+pw8c9RaOStfcqWcgtBiYwj3/v5yXxfPyIVe8grhVs/ZeKB8Bs4w== Received: from MW4PR03CA0273.namprd03.prod.outlook.com (2603:10b6:303:b5::8) by MN2PR12MB4157.namprd12.prod.outlook.com (2603:10b6:208:1db::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Sun, 7 Nov 2021 15:30:23 +0000 Received: from CO1NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::84) by MW4PR03CA0273.outlook.office365.com (2603:10b6:303:b5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Sun, 7 Nov 2021 15:30:23 +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 CO1NAM11FT047.mail.protection.outlook.com (10.13.174.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:22 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 7 Nov 2021 15:30:20 +0000 From: Matan Azrad To: Viacheslav Ovsiienko CC: , Thomas Monjalon , Michael Baum , Date: Sun, 7 Nov 2021 17:29:15 +0200 Message-ID: <20211107152919.2158802-2-matan@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211107152919.2158802-1-matan@nvidia.com> References: <20211107152919.2158802-1-matan@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68c49643-6bd3-4d9a-628d-08d9a203837a X-MS-TrafficTypeDiagnostic: MN2PR12MB4157: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:348; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IfbOvS0kkpLaBwiE+7Baxrr8HDsrtCNz/+ovUE1hFpVf/4IVQptpj6rf1vChhNqGOAzr5NbC+Bb3iIx9DY4LgFa7VzYs+OiWaJRwzYXN/PUwMGSroSGSP4iN1LFyJQe4bMStGv37vvLbdh/ePEjAuyXb9ydGDDmnTpnPyRsYH+MsjIZEFCA/wALJNgA19cc3lqLyhYN91/x4GEfmWaGj0iXYxqizkbdA4JhmOHTXdbdn2NCBalpRkIuC1an5c+u0UGbf/5WCCa3kOXnuSP3Hl38JSG0sl2WMs2MKuKTf9MZD6ye6QfgjLquaSpdu16gKbdYsJK0n8eygTMh2cbJFeBTx/iMnKwMwvTLmkC/bErN7UA5VRYwkhUc6/wHJbBHoipqROp9gCBsl5mWJ4+4cLZgSEUvMLTVbDs12CPC353FOQb856GXAhVmkjtVj33OsXz/UhWeMz47Z7TSx+LT54DeBckflV+Zfm1RFkzghATjGz7ZVcLMZTTvVnC6nWX1riibN3OWQlnGrxm6QoAmN/lXRccQx/7OtdRGCjgCpGq3a7cUBPlRo7GooiTZ3bfAMheq7850jb0ntbbfQh7fWpCBXZEe5RzZAuepX/yRCIcLH/8uBgj1zfRt1eJj9zj08tErYoHC6KnvkUUZW0RxmdzpdULg69jVG6cqnIuoDsjdHX/rzSFHKKRMtTYV32U/fBWhQyzKBEMCN6ESC0lCQTQ== 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)(46966006)(36840700001)(82310400003)(316002)(7636003)(37006003)(54906003)(2616005)(2906002)(70586007)(70206006)(508600001)(426003)(6636002)(8676002)(8936002)(36860700001)(336012)(6666004)(36756003)(1076003)(86362001)(5660300002)(7696005)(55016002)(16526019)(186003)(6862004)(4326008)(26005)(6286002)(356005)(47076005)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 15:30:22.2933 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68c49643-6bd3-4d9a-628d-08d9a203837a 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: CO1NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4157 Subject: [dpdk-dev] [PATCH 1/5] common/mlx5: glue MR registration with IOVA 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 Sender: "dev" From: Michael Baum Add support for rdma-core API to register IOVA MR. The API gets the process VA, size, and IOVA and returns a memory region with space pointed by a specific IOVA. So any access in this MR should come with an address that is relative to the IOVA specified in the API. Fixes: cc07a42da250 ("vdpa/mlx5: prepare memory regions") Cc: stable@dpdk.org Signed-off-by: Michael Baum Signed-off-by: Matan Azrad --- drivers/common/mlx5/linux/meson.build | 2 ++ drivers/common/mlx5/linux/mlx5_glue.c | 18 ++++++++++++++++++ drivers/common/mlx5/linux/mlx5_glue.h | 3 +++ 3 files changed, 23 insertions(+) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 2dcd27b778..7909f23e21 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -200,6 +200,8 @@ has_sym_args = [ 'MLX5DV_DR_ACTION_FLAGS_ASO_CT_DIRECTION_INITIATOR' ], [ 'HAVE_MLX5_DR_ALLOW_DUPLICATE', 'infiniband/mlx5dv.h', 'mlx5dv_dr_domain_allow_duplicate_rules' ], + [ 'HAVE_MLX5_IBV_REG_MR_IOVA', 'infiniband/verbs.h', + 'ibv_reg_mr_iova' ], ] config = configuration_data() foreach arg:has_sym_args diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c index 037ca961a0..bc6622053f 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.c +++ b/drivers/common/mlx5/linux/mlx5_glue.c @@ -224,6 +224,23 @@ mlx5_glue_reg_mr(struct ibv_pd *pd, void *addr, size_t length, int access) return ibv_reg_mr(pd, addr, length, access); } +static struct ibv_mr * +mlx5_glue_reg_mr_iova(struct ibv_pd *pd, void *addr, size_t length, + uint64_t iova, int access) +{ +#ifdef HAVE_MLX5_IBV_REG_MR_IOVA + return ibv_reg_mr_iova(pd, addr, length, iova, access); +#else + (void)pd; + (void)addr; + (void)length; + (void)iova; + (void)access; + errno = ENOTSUP; + return NULL; +#endif +} + static struct ibv_mr * mlx5_glue_alloc_null_mr(struct ibv_pd *pd) { @@ -1412,6 +1429,7 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) { .destroy_qp = mlx5_glue_destroy_qp, .modify_qp = mlx5_glue_modify_qp, .reg_mr = mlx5_glue_reg_mr, + .reg_mr_iova = mlx5_glue_reg_mr_iova, .alloc_null_mr = mlx5_glue_alloc_null_mr, .dereg_mr = mlx5_glue_dereg_mr, .create_counter_set = mlx5_glue_create_counter_set, diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h index f39ef2dac7..4e6d31f263 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.h +++ b/drivers/common/mlx5/linux/mlx5_glue.h @@ -197,6 +197,9 @@ struct mlx5_glue { int attr_mask); struct ibv_mr *(*reg_mr)(struct ibv_pd *pd, void *addr, size_t length, int access); + struct ibv_mr *(*reg_mr_iova)(struct ibv_pd *pd, void *addr, + size_t length, uint64_t iova, + int access); struct ibv_mr *(*alloc_null_mr)(struct ibv_pd *pd); int (*dereg_mr)(struct ibv_mr *mr); struct ibv_counter_set *(*create_counter_set) From patchwork Sun Nov 7 15:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 103906 X-Patchwork-Delegate: thomas@monjalon.net 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 6D6F2A0C41; Sun, 7 Nov 2021 16:30:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4628541125; Sun, 7 Nov 2021 16:30:28 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2071.outbound.protection.outlook.com [40.107.236.71]) by mails.dpdk.org (Postfix) with ESMTP id 6119B4111A; Sun, 7 Nov 2021 16:30:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jIpTmBD6vHG/6oVSTuoiHc8n/+g3o1xc1Z6IOcf+IEqHD2xq7ueAcoi3cGzpV0XIGIlB+mhOb8g9/YtI+QW3rFoRovRdEDJLFE8xWMZvxus/qB6iChFIS3yA5QnM8BnkdpOpFi2C5VKoKbMd7SvugI4oPWA1rolTXcpB9Ouy0w6E4bJKcVRwDIJK+gNw6xgLVFkwsLO6au6td81lTsOoHjMqXU4NXpTANeSdvdlRCJneJch6U3oG3mm676f9/LR4aUb4v2BejaCNc+WVE+TWJpFwGNxgHrOyrJOocjxC0dCZRhrYcnDyAlldUef3XBEqXvDC02ioqRMYpR9jJRWcqA== 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=mYmdsunAV162oNuH964rROMYDgwRPY41O74PcTjDu8M=; b=jdiEkY8Hc8QJEHteVZfqQ3/M56hS5AFJfgK1Mj2+SDajW69Rah82EhQkyNCDua1SvFXTL2CB5TgHSAo/BeBaRQaa+lB5/585XaXNCMcmJeN9SrB9pUhsUcXlCWTcK4X8ARAAVZ3Kcgg9hmenuK/DR/z8nzypwW6y666qdCEFipOYzCcWHHOeUvg4KNSGeHCZcx+KonnenlJyiz+hJ8/gWidOBBovyWm7Cgx/6ie5Yszr1WreUSUM2K8QQ3G1f8ISskZMaEd0C2B474wf5KDbT3ediLK+opSZBDXYWWaNPXbTmdKkqpRk4lNSimconO7HFO2lwMVr7AXxZ3OGpR0GOw== 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=mYmdsunAV162oNuH964rROMYDgwRPY41O74PcTjDu8M=; b=tDV1ta82Y43X7NmclDNTNRHR1Ze3hNQ5nsBbyoXNr0KKSZVotwp3wUxQCVVNQxazEryFquYvWK7nuqM48AEqdS3DKZEAb5Zo5Lku4fFy5b4hKVoxjakTiFvxO4/4HpnZu5tszdcKIsxkm/62EZduWv0fv54iYXlm3wxhkHVrl9a3MHbL0BnLHoxnJq1BfdvTZ9hA3lW5e7UECslcj7FzPVvNxU6EjrXJOnQpXv9iaywWkvFb6urAIGX2AD67rRDw7LBDrssasgBNLq7Vqv60oxid2vGehRLcF6tyAPRcydZp6m6eaBamsjs5L2C0rl9l058OUoUKP+zXtC3UMELLlA== Received: from MW4PR03CA0271.namprd03.prod.outlook.com (2603:10b6:303:b5::6) by BYAPR12MB3494.namprd12.prod.outlook.com (2603:10b6:a03:ad::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Sun, 7 Nov 2021 15:30:24 +0000 Received: from CO1NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::93) by MW4PR03CA0271.outlook.office365.com (2603:10b6:303:b5::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Sun, 7 Nov 2021 15:30:24 +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 CO1NAM11FT047.mail.protection.outlook.com (10.13.174.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:23 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 7 Nov 2021 15:30:22 +0000 From: Matan Azrad To: Viacheslav Ovsiienko CC: , Thomas Monjalon , , Michael Baum Date: Sun, 7 Nov 2021 17:29:16 +0200 Message-ID: <20211107152919.2158802-3-matan@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211107152919.2158802-1-matan@nvidia.com> References: <20211107152919.2158802-1-matan@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8085ffc6-e4c3-44c0-bff6-08d9a2038468 X-MS-TrafficTypeDiagnostic: BYAPR12MB3494: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:514; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: koxfDdbKqxQqZLvK9xYjbfslfHpajO6WivAVYvPh9gG5rh0KmgfDVa3hHdLwgJ/AV48yStytfuUoivGAiDjd//oMzD+Ydkzfh0q4B2tRa42cxYbYe5JyZAuNBqash2AqDFk5lro4qB20c+XetVB7xPLPv2nG0CZIGQEHLh1tKWSiEs8IUY1xCBXD5IjyUOV1mjwer3VhwDDgfr6VmISNJefBJvpZ1Ehv46tSLcTrgslvKgQITp62TcCO3H4+W2ZNHFnRL6ta9oO9K2Kt5o/kgeCgDstJagn+8YL1t2/1nQ5fLWucqvW/VipkyN6ermO7Kuja7zZD4xAYeFfXmay+0fXsneI4vHFOEtW8PUlJ/BXLpXsFVXPJXa36vnygdbFghGISR2WWGV5F3iHDUCULALmEwCBWf7gGw5e1fEmAer9PA68KofFIOoNS+GMC8zSoTCkSId7rqacoMevQ+wpMwzlGWlwXRC2CrpDzg+K7Mulx96V+0KtlXjeRXiWrq7Th1p+iPKiedoMW5LsoEtEACzecBEsZVfPDnStMSi4HX3cj80w5uCjOgyUGHifBHKygpfBo6wDmP/ccH92Q/iKPqGSsye2c8JhDfnOt4ZNVVxX4JTdoSpKJPT4tEH+/f9yTWJo/nVzigCLhRShnsD2u9KLbn7jEtKqyD+2lQKlQlDzo+r4Q7wLOJ69ypVRSUixenYcaJgVrfXcw591Fd4XaWg== 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)(1076003)(6666004)(316002)(54906003)(86362001)(6286002)(2906002)(2616005)(37006003)(16526019)(36860700001)(47076005)(7696005)(107886003)(82310400003)(356005)(508600001)(70586007)(186003)(5660300002)(336012)(426003)(4326008)(70206006)(55016002)(6862004)(83380400001)(6636002)(7636003)(26005)(36756003)(8936002)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 15:30:23.8625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8085ffc6-e4c3-44c0-bff6-08d9a2038468 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: CO1NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3494 Subject: [dpdk-dev] [PATCH 2/5] common/mlx5: add wrapped MR create API 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 Sender: "dev" As a workaround to kernel driver/FW issues of the mlx5 devices, it is needed to use MR, which is an indirect mkey pointing to direct mkey created by the kernel for any DevX command uses an MR. Add an API to create and destroy this wrapped MR. Fixes: 5382d28c2110 ("net/mlx5: accelerate DV flow counter transactions") Fixes: 9d39e57f21ac ("vdpa/mlx5: support live migration") Cc: stable@dpdk.org Signed-off-by: Michael Baum Signed-off-by: Matan Azrad --- drivers/common/mlx5/linux/mlx5_common_os.c | 56 ++++++++++++++++++++++ drivers/common/mlx5/mlx5_common.h | 18 +++++++ drivers/common/mlx5/version.map | 3 ++ 3 files changed, 77 insertions(+) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index b516564b79..0d3e24e04e 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -744,3 +744,59 @@ mlx5_get_device_guid(const struct rte_pci_addr *dev, uint8_t *guid, size_t len) fclose(id_file); return ret; } + +/* + * Create direct mkey using the kernel ibv_reg_mr API and wrap it with a new + * indirect mkey created by the DevX API. + * This mkey should be used for DevX commands requesting mkey as a parameter. + */ +int +mlx5_os_wrapped_mkey_create(void *ctx, void *pd, uint32_t pdn, void *addr, + size_t length, struct mlx5_pmd_wrapped_mr *pmd_mr) +{ + struct mlx5_klm klm = { + .byte_count = length, + .address = (uintptr_t)addr, + }; + struct mlx5_devx_mkey_attr mkey_attr = { + .pd = pdn, + .klm_array = &klm, + .klm_num = 1, + }; + struct mlx5_devx_obj *mkey; + struct ibv_mr *ibv_mr = mlx5_glue->reg_mr(pd, addr, length, + IBV_ACCESS_LOCAL_WRITE | + (haswell_broadwell_cpu ? 0 : + IBV_ACCESS_RELAXED_ORDERING)); + + if (!ibv_mr) { + rte_errno = errno; + return -rte_errno; + } + klm.mkey = ibv_mr->lkey; + mkey_attr.addr = (uintptr_t)addr; + mkey_attr.size = length; + mkey = mlx5_devx_cmd_mkey_create(ctx, &mkey_attr); + if (!mkey) { + claim_zero(mlx5_glue->dereg_mr(ibv_mr)); + return -rte_errno; + } + pmd_mr->addr = addr; + pmd_mr->len = length; + pmd_mr->obj = (void *)ibv_mr; + pmd_mr->imkey = mkey; + pmd_mr->lkey = mkey->id; + return 0; +} + +void +mlx5_os_wrapped_mkey_destroy(struct mlx5_pmd_wrapped_mr *pmd_mr) +{ + if (!pmd_mr) + return; + if (pmd_mr->imkey) + claim_zero(mlx5_devx_cmd_destroy(pmd_mr->imkey)); + if (pmd_mr->obj) + claim_zero(mlx5_glue->dereg_mr(pmd_mr->obj)); + memset(pmd_mr, 0, sizeof(*pmd_mr)); +} diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h index 744c6a72b3..62109a671a 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -429,4 +429,22 @@ mlx5_mr_mb2mr(struct mlx5_common_device *cdev, struct mlx5_mp_id *mp_id, int mlx5_os_open_device(struct mlx5_common_device *cdev, uint32_t classes); int mlx5_os_pd_create(struct mlx5_common_device *cdev); +/* mlx5 PMD wrapped MR struct. */ +struct mlx5_pmd_wrapped_mr { + uint32_t lkey; + void *addr; + size_t len; + void *obj; /* verbs mr object or devx umem object. */ + void *imkey; /* DevX indirect mkey object. */ +}; + +__rte_internal +int +mlx5_os_wrapped_mkey_create(void *ctx, void *pd, uint32_t pdn, void *addr, + size_t length, struct mlx5_pmd_wrapped_mr *pmd_mr); + +__rte_internal +void +mlx5_os_wrapped_mkey_destroy(struct mlx5_pmd_wrapped_mr *pmd_mr); + #endif /* RTE_PMD_MLX5_COMMON_H_ */ diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 6e17a7b8b8..b6c045c110 100644 --- a/drivers/common/mlx5/version.map +++ b/drivers/common/mlx5/version.map @@ -133,6 +133,9 @@ INTERNAL { mlx5_os_umem_dereg; mlx5_os_umem_reg; + mlx5_os_wrapped_mkey_create; # WINDOWS_NO_EXPORT + mlx5_os_wrapped_mkey_destroy; # WINDOWS_NO_EXPORT + mlx5_realloc; mlx5_translate_port_name; # WINDOWS_NO_EXPORT From patchwork Sun Nov 7 15:29:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 103907 X-Patchwork-Delegate: thomas@monjalon.net 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 22D9DA0C41; Sun, 7 Nov 2021 16:30:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6AB4C4111C; Sun, 7 Nov 2021 16:30:30 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) by mails.dpdk.org (Postfix) with ESMTP id AB9B141134; Sun, 7 Nov 2021 16:30:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DF5TXrhxLaRe9Aq8M82W01r6DIhaDJ7SKGRW6ALbeHPIDBSRMV6GlqeokRtFjvVz3SW3BS13Uq6wg99Id20AS8MgoeDGUc5xW7yVqDkVQ860S8CI41UpZaYtdj5DJ7HAZuXSXQD/S86LNrX/+/yjsN7suHWFqM948pwhth2hvHl+Dm7zPARQWV0bDNe7O7eIxnvo1jRn0r00YyqDcPMZ97VDJvucFK0dUxNfd8HEbG8DhuIV+X73Y1RNmcaMwmotooR3yGETguYtsXeEBDHEHdtEfLMiHIcwcPnqofqdAD8ymUOb0sPNq7iOLCCIUl5lnbiplGFGRc1irgb8oKjIPA== 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=lmJsMikXnPydeGxO45Kyp2IgVhTo2Nuaf47Bnq7tpDs=; b=OxFLk9w+oKTVu9afWEfrCaIyzrdRf8dTuGt39HhFmurzvW3OdIZHVjCsGYfQ9oTnkXggL7a0gdc/eqyvMdXInWXjQsvZKCHmTAp9blYMPC3/IzIMkcb1KBN3J9Wd48LAEoIb1JCSnicuhRxwS0d5/jRpgLkSnmNHc1EF5/6ARNJ3SYtklL5OpXzTfjkTsBWKokZZiyt8t1kX3Z5sq0oph09dq4Ci8ZYeYx/c32X0QK4X8ETvvBvQUWW0SQc44OqC6ZqvPETDfJbIKghe3dFUqfTs+u12soTCyDqtk8OoyC8zBHOsyXQSieJFSj3rpvxwvs8VvRTnNMEZlzkjIIXycQ== 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=lmJsMikXnPydeGxO45Kyp2IgVhTo2Nuaf47Bnq7tpDs=; b=UwFLzhvlTdSUE/P3IMS0MHQxT4cUOGfUCNZPuGSDrdckefXLl0XYhBvH0b2oro3Ij6Rs5h/eNX433ox2pRIsz9Y7x8WwIgO3mjfW+dTm7x8t1h8DoMn+G2+V01pL2Za/confpCvJE6a3K94x+5XsGl3TynQsbwCxk7Lq3xoiX9NZ1wZ05qvUb8asFty4jZijucZjtHdVEdXmZuY6bk/N4BFxYRzLCKT7zp68qToDdkJZ1IyldGoAiELaSiw9VzAxLmoteCWE6MEJRlotexCLsjOQC7LA9km6TAGz/PfIZJ67J6V9Ag1g0EXcaTJfipuwZ+u/6MB8+fJazA9oLAJbkQ== Received: from MWHPR21CA0041.namprd21.prod.outlook.com (2603:10b6:300:129::27) by DM5PR12MB2344.namprd12.prod.outlook.com (2603:10b6:4:b2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Sun, 7 Nov 2021 15:30:26 +0000 Received: from CO1NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:300:129:cafe::a) by MWHPR21CA0041.outlook.office365.com (2603:10b6:300:129::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.0 via Frontend Transport; Sun, 7 Nov 2021 15:30:26 +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 CO1NAM11FT054.mail.protection.outlook.com (10.13.174.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:25 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 7 Nov 2021 15:30:23 +0000 From: Matan Azrad To: Viacheslav Ovsiienko CC: , Thomas Monjalon , , Michael Baum Date: Sun, 7 Nov 2021 17:29:17 +0200 Message-ID: <20211107152919.2158802-4-matan@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211107152919.2158802-1-matan@nvidia.com> References: <20211107152919.2158802-1-matan@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1529d0b9-2425-4540-21d7-08d9a203858b X-MS-TrafficTypeDiagnostic: DM5PR12MB2344: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:38; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hHVuwdbjdoh7aiDbtZXbdUtMpwJBaAZmtnmBIbdarqzVodOCtF3urkxNQVTbNeksEUCjRwkOP8A8PZzneP9BJPqNz5ZRN+coJDjUe35aAi0zHgBS4GeZQBz6g6ERWKlMcxcsH4D2hBIu3wjjlJREcKsX4HWHXChkHHhs6ky5iVBkdi5HkdD9Z5EoPYNoYsEU1hGOevgfZgXwnZ/aZxBFPzelO4ZTqCEjMRJxeWRNgs7O1DP2saY9UwtxbIY794rziE9LdmsX68iwHXP+XsHd5Sv2c/dH8Nj1pJLelS0ZbxOWEyHnwhBI9dOd9oUiESRak8H/1GxjW8gtqZ4ajpYXpKoCBKTsJiIjI2RxS1pk2XPtgm9opsImFXHiX6QYtwk2c1n4eTq70Pp03iWEbReq7Esoa7UUte+gaNln3RN5s14ZDSL6/Gq5b/1YiUg7rhRnUQzMaKw6O/ur84Ej9zAHNE/x5lJUoeDS44GJRbxSZYAZNqpcgdFgA0VPNbtbT8xuG8CUQKSQf0WxU/vEAmbK1/BucG9IdACV76blW8bHoz2vBoiz0ovmrb/xfej2HzCjKXLHH17V/ZKANXGQf9HEX018Kbi+C1PhLENnGWWuQc2cfj3qM02+MPLXVadMfEQI2i+M4uvDr1A8gzOlIT+cb1sIY7iFC6otr33qakpvwNXvcfSogeUCU/4kqzinxPtloTxAYtjYOZTsmHlGnuQo9JsRaB1j1zrVXpKa48hwk1I= 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)(86362001)(37006003)(508600001)(2616005)(316002)(7696005)(36756003)(36906005)(426003)(6862004)(82310400003)(336012)(2906002)(107886003)(1076003)(70206006)(54906003)(70586007)(4326008)(36860700001)(47076005)(83380400001)(5660300002)(26005)(6286002)(16526019)(8936002)(6636002)(186003)(55016002)(8676002)(7636003)(356005)(6666004)(14143004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 15:30:25.7735 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1529d0b9-2425-4540-21d7-08d9a203858b 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: CO1NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2344 Subject: [dpdk-dev] [PATCH 3/5] vdpa/mlx5: workaround dirty bitmap MR creation 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 Sender: "dev" Due to kernel driver/FW issues in direct MKEY creation using the DevX API, this patch replaces the dirty bitmap MR creation to use wrapped mkey instead. Fixes: 9d39e57f21ac ("vdpa/mlx5: support live migration") Cc: stable@dpdk.org Signed-off-by: Michael Baum Signed-off-by: Matan Azrad --- drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + drivers/vdpa/mlx5/mlx5_vdpa_lm.c | 37 ++++++------------------------- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 2 ++ 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index a6c9404cb0..3a7cf088b8 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -147,6 +147,7 @@ struct mlx5_vdpa_priv { struct mlx5_vdpa_steer steer; struct mlx5dv_var *var; void *virtq_db_addr; + struct mlx5_pmd_wrapped_mr lm_mr; SLIST_HEAD(mr_list, mlx5_vdpa_query_mr) mr_list; struct mlx5_vdpa_virtq virtqs[]; }; diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c index 3e8d9eb9a2..45a968bb6a 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_lm.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_lm.c @@ -36,38 +36,21 @@ int mlx5_vdpa_dirty_bitmap_set(struct mlx5_vdpa_priv *priv, uint64_t log_base, uint64_t log_size) { - struct mlx5_devx_mkey_attr mkey_attr = { - .addr = (uintptr_t)log_base, - .size = log_size, - .pd = priv->cdev->pdn, - .pg_access = 1, - }; struct mlx5_devx_virtq_attr attr = { .type = MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_PARAMS, .dirty_bitmap_addr = log_base, .dirty_bitmap_size = log_size, }; - struct mlx5_vdpa_query_mr *mr = rte_malloc(__func__, sizeof(*mr), 0); int i; + int ret = mlx5_os_wrapped_mkey_create(priv->cdev->ctx, priv->cdev->pd, + priv->cdev->pdn, (void *)log_base, + log_size, &priv->lm_mr); - if (!mr) { - DRV_LOG(ERR, "Failed to allocate mem for lm mr."); + if (!ret) { + DRV_LOG(ERR, "Failed to allocate wrapped MR for lm."); return -1; } - mr->umem = mlx5_glue->devx_umem_reg(priv->cdev->ctx, - (void *)(uintptr_t)log_base, - log_size, IBV_ACCESS_LOCAL_WRITE); - if (!mr->umem) { - DRV_LOG(ERR, "Failed to register umem for lm mr."); - goto err; - } - mkey_attr.umem_id = mr->umem->umem_id; - mr->mkey = mlx5_devx_cmd_mkey_create(priv->cdev->ctx, &mkey_attr); - if (!mr->mkey) { - DRV_LOG(ERR, "Failed to create Mkey for lm."); - goto err; - } - attr.dirty_bitmap_mkey = mr->mkey->id; + attr.dirty_bitmap_mkey = priv->lm_mr.lkey; for (i = 0; i < priv->nr_virtqs; ++i) { attr.queue_index = i; if (!priv->virtqs[i].virtq) { @@ -78,15 +61,9 @@ mlx5_vdpa_dirty_bitmap_set(struct mlx5_vdpa_priv *priv, uint64_t log_base, goto err; } } - mr->is_indirect = 0; - SLIST_INSERT_HEAD(&priv->mr_list, mr, next); return 0; err: - if (mr->mkey) - mlx5_devx_cmd_destroy(mr->mkey); - if (mr->umem) - mlx5_glue->devx_umem_dereg(mr->umem); - rte_free(mr); + mlx5_os_wrapped_mkey_destroy(&priv->lm_mr); return -1; } diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c index f551a094cd..d7707bbd91 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c @@ -31,6 +31,8 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = next; } SLIST_INIT(&priv->mr_list); + if (priv->lm_mr.addr) + mlx5_os_wrapped_mkey_destroy(&priv->lm_mr); if (priv->null_mr) { claim_zero(mlx5_glue->dereg_mr(priv->null_mr)); priv->null_mr = NULL; From patchwork Sun Nov 7 15:29:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 103908 X-Patchwork-Delegate: thomas@monjalon.net 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 4AF4DA0C41; Sun, 7 Nov 2021 16:30:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3EE241145; Sun, 7 Nov 2021 16:30:31 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id 07B6C4111A; Sun, 7 Nov 2021 16:30:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VLNsY32UJRPwHbogKwoD/JX9AqbOVyF/WWPFQOAYOQuv83h4TtwpKzaYSkgSatXwQ4x3ATlIx5X+JOg2bygo+m9nTFkDDGF78WZzcT5nApRFYKi4CyuSsGFN136+8KRV/C5FvSvTA+MzVb4wukHRXb8GG4mX8sr6NKKISrLlDoqJBx/2ho4BFLgwAm4X7MRYsN39QWcs70kf9LC8X44/H5YcfYHK9tfiRFbmN/5GSu/RtGfJCE6r//lAhspdlGe+ENMSc/TNwBWHXkC/kj/zLmtbJjondH18x5UUw13JFK9xaiNo47i2bVhdz5TXazY0oXrZtPJ5PXT5jVXMdNdOgg== 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=DO/rcYttn5sV90gE4sGEueJVlZf6dKUCl+RAfD2Ounw=; b=P0eo2p/5N7tC5WW4K2Jdtxz5bzxtOgQvd9ekDoVqVtSnKjNgxSSSlPPQAoLqj56BT38avK5ClEmpxbGD3WQkiG4qdZjRFvfXEwnQUEqOiRrXKFfiOj1080QcZS0MoSQL7iFh6JFL++BVbK9lDOiZQnNNVWb4pBgid5AyVA82buTgb9A8ep2/zrO555PT+VXPRSQ7Kam6vEoDzXC/29WhVDd5LdZp5QOgsOJK6q3pZh4aFHweBbAELr0r+Nkl+LdID3EagFCV6jLQA7POZsOdSx227b6eoPN/PlHWbKk53GiyFhUWmLDXuWAxspIaCRRLr1pFMPfjUxcGiD2rssubcA== 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=DO/rcYttn5sV90gE4sGEueJVlZf6dKUCl+RAfD2Ounw=; b=NvzLVifTJKfRd9XCq7amdMlv7yxo5fN1du5N1FNzHSowl58PqXO4+NzsyXBcYW5ch/RkEkiWRhKudqtHguwaglU3aGX7FmJMcu9SYN16Af0jPk6IDP/CqOiQXxJ/GA0NQAM25CJ1DciyXmCMbSLeKTcq3q0ddZnZ4ta/E9QqQBdSv5YONy6w8yqwnnWDP5UArk5NKAhCxwFH7V24w1ExI2WYFa+6KphkmIh7Z8N4rsINurSxL2BLJ2la0DogGMnPPvucO3zykf+YN6T2KlsHcr/G2EgLSBbE8WihFeKJvJl78N0fYFzoFE0EQDSFpo/t73d3SA65JY2srBmEp+luCw== Received: from MWHPR18CA0043.namprd18.prod.outlook.com (2603:10b6:320:31::29) by DM6PR12MB4355.namprd12.prod.outlook.com (2603:10b6:5:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Sun, 7 Nov 2021 15:30:28 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:320:31:cafe::41) by MWHPR18CA0043.outlook.office365.com (2603:10b6:320:31::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:28 +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 CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:27 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 7 Nov 2021 15:30:25 +0000 From: Matan Azrad To: Viacheslav Ovsiienko CC: , Thomas Monjalon , Michael Baum , Date: Sun, 7 Nov 2021 17:29:18 +0200 Message-ID: <20211107152919.2158802-5-matan@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211107152919.2158802-1-matan@nvidia.com> References: <20211107152919.2158802-1-matan@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc36677d-fc24-4908-1112-08d9a20386b8 X-MS-TrafficTypeDiagnostic: DM6PR12MB4355: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:130; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p/c9N77CYhfa0x+ik3UCdC0hGQlK7YVgW6YZIIYfvzRP/UTObPOHBJz440KkErCFz9P4bFGVKPPlsFcVW1lfqUqIcB4b68uBiCOW3N7KHXyFXzUrJ7u/BKKjWyYXndFFms9WekrGH0AAVB7EAvi9AKraJkYral+EDKYET1smNSt1Nimp2jhJXMsgV3oJ9lzyUwKvc/gNj03gvhNf4dsOAOA696cwQLm0xuswJUIrIu9z0hSMVpDcenr3Pm7SOfjf6sv8mu5iMswyYaLS1YnPWEZ8iHPhW4ZDue1WsqyIr8ctmf93q4sJVORdcbnlvy/UtOvSqLRpUgVV/pxBCH8M7yMLtuX+tW4e6nwb+Sz/nqR+qFETCHWghXn0QsZqire85fWBczkLquZ8GjitPqdmXSxMD8PfLnu9Tmt1Jeh3113RCgCMjaN6UfeWJz6VWPUeC6eJdumhySXk8sZjOPMvJ699h0zYFZHFmGFHVJvLNZMqSx0TKdUZ5srf/42/wA6Igx+NoauPfLSXyzraTVQrdFRdKO/skTQBp4orh7neqROHXaDyvCxBj3AisCxBq94bOhmh3ynZDMTCMxGYDD4ArDtBgOn1KmNak0u4p0dWlG69hywtWeciJvNH07i9FUaQfvF71IpY0PDa4J3ZfEzeDwWt26PG8bPtOSZvhGnMnpU2n+2KpIxdx+la30MA+/cxDMzXsdeBsHvHdBPDG/deEw== 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)(46966006)(36840700001)(37006003)(6636002)(26005)(8936002)(55016002)(356005)(186003)(7636003)(316002)(54906003)(82310400003)(4326008)(2906002)(508600001)(70586007)(70206006)(47076005)(1076003)(7696005)(5660300002)(6666004)(426003)(86362001)(6286002)(6862004)(16526019)(83380400001)(8676002)(2616005)(36756003)(36860700001)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 15:30:27.7397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc36677d-fc24-4908-1112-08d9a20386b8 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: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4355 Subject: [dpdk-dev] [PATCH 4/5] vdpa/mlx5: workaround guest MR registrations 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 Sender: "dev" From: Michael Baum Due to kernel issue in direct MKEY creation using the DevX API, this patch replaces the virtio MR creation to use Verbs API. Fixes: cc07a42da250 ("vdpa/mlx5: prepare memory regions") Cc: stable@dpdk.org Signed-off-by: Michael Baum Signed-off-by: Matan Azrad --- drivers/vdpa/mlx5/mlx5_vdpa.h | 8 +++--- drivers/vdpa/mlx5/mlx5_vdpa_mem.c | 41 +++++++++---------------------- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index 3a7cf088b8..f290fb4895 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -59,10 +59,10 @@ struct mlx5_vdpa_event_qp { struct mlx5_vdpa_query_mr { SLIST_ENTRY(mlx5_vdpa_query_mr) next; - void *addr; - uint64_t length; - struct mlx5dv_devx_umem *umem; - struct mlx5_devx_obj *mkey; + union { + struct ibv_mr *mr; + struct mlx5_devx_obj *mkey; + }; int is_indirect; }; diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c index d7707bbd91..b1b9053bff 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c @@ -23,9 +23,10 @@ mlx5_vdpa_mem_dereg(struct mlx5_vdpa_priv *priv) entry = SLIST_FIRST(&priv->mr_list); while (entry) { next = SLIST_NEXT(entry, next); - claim_zero(mlx5_devx_cmd_destroy(entry->mkey)); - if (!entry->is_indirect) - claim_zero(mlx5_glue->devx_umem_dereg(entry->umem)); + if (entry->is_indirect) + claim_zero(mlx5_devx_cmd_destroy(entry->mkey)); + else + claim_zero(mlx5_glue->dereg_mr(entry->mr)); SLIST_REMOVE(&priv->mr_list, entry, mlx5_vdpa_query_mr, next); rte_free(entry); entry = next; @@ -202,7 +203,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv) goto error; } DRV_LOG(DEBUG, "Dump fill Mkey = %u.", priv->null_mr->lkey); - memset(&mkey_attr, 0, sizeof(mkey_attr)); for (i = 0; i < mem->nregions; i++) { reg = &mem->regions[i]; entry = rte_zmalloc(__func__, sizeof(*entry), 0); @@ -211,28 +211,15 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv) DRV_LOG(ERR, "Failed to allocate mem entry memory."); goto error; } - entry->umem = mlx5_glue->devx_umem_reg(priv->cdev->ctx, - (void *)(uintptr_t)reg->host_user_addr, - reg->size, IBV_ACCESS_LOCAL_WRITE); - if (!entry->umem) { - DRV_LOG(ERR, "Failed to register Umem by Devx."); - ret = -errno; - goto error; - } - mkey_attr.addr = (uintptr_t)(reg->guest_phys_addr); - mkey_attr.size = reg->size; - mkey_attr.umem_id = entry->umem->umem_id; - mkey_attr.pd = priv->cdev->pdn; - mkey_attr.pg_access = 1; - entry->mkey = mlx5_devx_cmd_mkey_create(priv->cdev->ctx, - &mkey_attr); - if (!entry->mkey) { + entry->mr = mlx5_glue->reg_mr_iova(priv->cdev->pd, + (void *)(uintptr_t)(reg->host_user_addr), + reg->size, reg->guest_phys_addr, + IBV_ACCESS_LOCAL_WRITE); + if (!entry->mr) { DRV_LOG(ERR, "Failed to create direct Mkey."); ret = -rte_errno; goto error; } - entry->addr = (void *)(uintptr_t)(reg->host_user_addr); - entry->length = reg->size; entry->is_indirect = 0; if (i > 0) { uint64_t sadd; @@ -262,12 +249,13 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv) for (k = 0; k < reg->size; k += klm_size) { klm_array[klm_index].byte_count = k + klm_size > reg->size ? reg->size - k : klm_size; - klm_array[klm_index].mkey = entry->mkey->id; + klm_array[klm_index].mkey = entry->mr->lkey; klm_array[klm_index].address = reg->guest_phys_addr + k; klm_index++; } SLIST_INSERT_HEAD(&priv->mr_list, entry, next); } + memset(&mkey_attr, 0, sizeof(mkey_attr)); mkey_attr.addr = (uintptr_t)(mem->regions[0].guest_phys_addr); mkey_attr.size = mem_size; mkey_attr.pd = priv->cdev->pdn; @@ -295,13 +283,8 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv) priv->gpa_mkey_index = entry->mkey->id; return 0; error: - if (entry) { - if (entry->mkey) - mlx5_devx_cmd_destroy(entry->mkey); - if (entry->umem) - mlx5_glue->devx_umem_dereg(entry->umem); + if (entry) rte_free(entry); - } mlx5_vdpa_mem_dereg(priv); rte_errno = -ret; return ret; From patchwork Sun Nov 7 15:29:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 103909 X-Patchwork-Delegate: thomas@monjalon.net 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 BE110A0C41; Sun, 7 Nov 2021 16:31:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65BC74114E; Sun, 7 Nov 2021 16:30:33 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2083.outbound.protection.outlook.com [40.107.92.83]) by mails.dpdk.org (Postfix) with ESMTP id 905BA41141; Sun, 7 Nov 2021 16:30:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N2myB/1gqcjeDQNia8/v9Hn11t/sJzSSqWx9D8eXmp0oXnFI7tWkawierIlXSL5YXz88Zs5Hq2Fc9o/nOM1prgftFhaz0YsMtWcOnHLDUbvh3SItvhBrGcFdbn1J3x6ezKA40UWyTl1xpkm+fQupDGFfg8JcrJLdOVOVgX1zdCuV9fFxJxwxQkcrpe5zCN8EJgXAVDryXyuA0gCKU+6Enl8B17ga++PATBa6V1mWOC8KTG1fsI9BrarO0BSZV/XLwTOfHQdV6SQ8Ejnr9TZ/YmuEDdhM74k38k8karSn7wwNSKjydLu2cdwyahgQM2H2ekqsLbNEfvLajszrq9P6Hw== 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=lVXJ7lAedzYcFM0C13Dm0Ef1HmInUQzhyrCiM1gyGkY=; b=H917ZJilJzxnMRdpcpN6ddkwYFZmlGwSZwn+q8GYr+8Og46xOP58H873fLnifGcVQGr4vadPBAwDe6KGGKzT3DEipH9sO0i8qNmyTqF63JcvOKn8UY/D7JhgQ1i/X21R0a7XLPPtSeh8FSbYRlgvRLotJQ8/E3rxoRtwKjlhX0xtW4sVDJhkSgQ6/lIX5SUH7zOvSHY4kOWrwUsgQ/GK0Qog2k/XKV04h+xfz3lobfdnRrHJhJe4/xG+qRarnJ5j+m5kW8zVdXjllLVWz2l1nM6zkDBfT5nC+e/+xr9PArErmS+aKYkvI717UWzwscv9WpsJAkh6fieWglhDaRLPtQ== 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=lVXJ7lAedzYcFM0C13Dm0Ef1HmInUQzhyrCiM1gyGkY=; b=B+y98NDAyKhk+dNWVrDN+ZyIgF3i6G0sEKoj12C/PWIGSiNH67vTU7SN+aPgPp91sdeaCacA6qSDxVbdqNKiY03ae110R1+mWf/HpHJqLQybBiP3VBcyyh6UCFQa57wVFI80MMpSViOWiOQ5N/8FGXdWgAios3zlq+vkkPwnQAZvt6mmCUbqD8bkO541kIGEzWOLM1RhrSx/3yjfWU3kHHKxrnNLJCKGnuyIgwayNCyhDpKEIF5yehVG7ptcWhj3IxacplHU2TLqJsG+qAwTLXa06OBg8YcMl48kXvrXqCJrY6cWq/+5tz/h2MQqueGK4Xl1hHlsHVjqL+PKurabTg== Received: from MWHPR18CA0043.namprd18.prod.outlook.com (2603:10b6:320:31::29) by DM6PR12MB4355.namprd12.prod.outlook.com (2603:10b6:5:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Sun, 7 Nov 2021 15:30:30 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:320:31:cafe::41) by MWHPR18CA0043.outlook.office365.com (2603:10b6:320:31::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:30 +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 CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Sun, 7 Nov 2021 15:30:29 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 7 Nov 2021 15:30:27 +0000 From: Matan Azrad To: Viacheslav Ovsiienko CC: , Thomas Monjalon , Michael Baum , Date: Sun, 7 Nov 2021 17:29:19 +0200 Message-ID: <20211107152919.2158802-6-matan@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211107152919.2158802-1-matan@nvidia.com> References: <20211107152919.2158802-1-matan@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37a8e184-aa25-444e-bd0d-08d9a20387f7 X-MS-TrafficTypeDiagnostic: DM6PR12MB4355: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:246; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zGIy9zCMjYEFLQx3DwCHraBqDI7EUmDMUYmgCZi5tEUZi2FfauK6yrnTY5rCKzSudqW5B0NT+D6Zs9e2DiQEOgO3FjualqaBJG8Ncs9zjI6IjNcPg4pAsHhD3fWOULaVg/p+bebX9JjyoiyBz3ATstEc/lpMDgSycO/qYA+lLKuhanjHXkOeoGyQ3dRaS5Ko6PpbZ80CDH8G//lELii7m/S6vvTv7Jka5/CmhBjo6oeNFe6ayJZHIYcD/CcPps/PGsNaKMxu9VNuP9AXmpajapWIvaYMcjgrB2EzM6O8y43vZiBVZI5sfUm4gcjYQ8ujOWnCYf4CZgXnSWYx5i5/dKfrt8OK8S1p4JjJnE7JTPC0FqVvqUnRrZV6FjKFZPE0l4XlSALlk1mXzA5UXQRN4S1j9ETKDTai6wHGVYaTnDarvqHlJkwyPUxzoiEiotoYMbqzYQbwSxesDwrpdpHFfgVfuJqhaSChHoGLmyj0nRjSEHSp+x2M/5Z4QqmZ1H6ykyIKs9OxqoxrMZHTwYBYWfV26dzAUJPUEWjEcpOI54Bm2kHeY/2J+eIPUcdcrmSzM3s3U2kKyX6SCIPsZ099u4cBYbmTgsFpMCAV1fX7ypUaah+FhyEqk2xMck80ZhdJfYeXLmiH0OqCsXx0ajf/j8JtopEWVapygPrvFd4k6MzreKoVCHQIKFV/alRQU91WQedr0mpqt9HQcvVa/vAkMQ== 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)(46966006)(36840700001)(37006003)(6636002)(26005)(8936002)(55016002)(356005)(186003)(7636003)(316002)(54906003)(82310400003)(4326008)(2906002)(508600001)(70586007)(70206006)(47076005)(1076003)(7696005)(5660300002)(6666004)(426003)(86362001)(6286002)(6862004)(16526019)(83380400001)(8676002)(2616005)(36756003)(36860700001)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 15:30:29.8248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37a8e184-aa25-444e-bd0d-08d9a20387f7 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: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4355 Subject: [dpdk-dev] [PATCH 5/5] net/mlx5: workaround counter memory region creation 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 Sender: "dev" From: Michael Baum Due to kernel driver / FW issues in direct MKEY creation using the DevX API, this patch replaces the counter MR creation to use wrapped mkey API. Fixes: 5382d28c2110 ("net/mlx5: accelerate DV flow counter transactions") Cc: stable@dpdk.org Signed-off-by: Michael Baum Signed-off-by: Matan Azrad --- drivers/net/mlx5/mlx5.c | 8 +------- drivers/net/mlx5/mlx5.h | 5 +---- drivers/net/mlx5/mlx5_flow.c | 25 ++++++------------------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9c8d1cc76f..da21a30390 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -521,7 +521,6 @@ mlx5_flow_aging_init(struct mlx5_dev_ctx_shared *sh) static void mlx5_flow_counters_mng_init(struct mlx5_dev_ctx_shared *sh) { - struct mlx5_hca_attr *attr = &sh->cdev->config.hca_attr; int i; memset(&sh->cmng, 0, sizeof(sh->cmng)); @@ -534,10 +533,6 @@ mlx5_flow_counters_mng_init(struct mlx5_dev_ctx_shared *sh) TAILQ_INIT(&sh->cmng.counters[i]); rte_spinlock_init(&sh->cmng.csl[i]); } - if (sh->devx && !haswell_broadwell_cpu) { - sh->cmng.relaxed_ordering_write = attr->relaxed_ordering_write; - sh->cmng.relaxed_ordering_read = attr->relaxed_ordering_read; - } } /** @@ -552,8 +547,7 @@ mlx5_flow_destroy_counter_stat_mem_mng(struct mlx5_counter_stats_mem_mng *mng) uint8_t *mem = (uint8_t *)(uintptr_t)mng->raws[0].data; LIST_REMOVE(mng, next); - claim_zero(mlx5_devx_cmd_destroy(mng->dm)); - claim_zero(mlx5_os_umem_dereg(mng->umem)); + mlx5_os_wrapped_mkey_destroy(&mng->wm); mlx5_free(mem); } diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 9307a4f95b..05f2618aed 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -462,8 +462,7 @@ struct mlx5_flow_counter_pool { struct mlx5_counter_stats_mem_mng { LIST_ENTRY(mlx5_counter_stats_mem_mng) next; struct mlx5_counter_stats_raw *raws; - struct mlx5_devx_obj *dm; - void *umem; + struct mlx5_pmd_wrapped_mr wm; }; /* Raw memory structure for the counter statistics values of a pool. */ @@ -494,8 +493,6 @@ struct mlx5_flow_counter_mng { uint8_t pending_queries; uint16_t pool_index; uint8_t query_thread_on; - bool relaxed_ordering_read; - bool relaxed_ordering_write; bool counter_fallback; /* Use counter fallback management. */ LIST_HEAD(mem_mngs, mlx5_counter_stats_mem_mng) mem_mngs; LIST_HEAD(stat_raws, mlx5_counter_stats_raw) free_stat_raws; diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2f30a35525..40625688b0 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -7775,7 +7775,6 @@ mlx5_counter_query(struct rte_eth_dev *dev, uint32_t cnt, static int mlx5_flow_create_counter_stat_mem_mng(struct mlx5_dev_ctx_shared *sh) { - struct mlx5_devx_mkey_attr mkey_attr; struct mlx5_counter_stats_mem_mng *mem_mng; volatile struct flow_counter_stats *raw_data; int raws_n = MLX5_CNT_CONTAINER_RESIZE + MLX5_MAX_PENDING_QUERIES; @@ -7785,6 +7784,7 @@ mlx5_flow_create_counter_stat_mem_mng(struct mlx5_dev_ctx_shared *sh) sizeof(struct mlx5_counter_stats_mem_mng); size_t pgsize = rte_mem_page_size(); uint8_t *mem; + int ret; int i; if (pgsize == (size_t)-1) { @@ -7799,23 +7799,10 @@ mlx5_flow_create_counter_stat_mem_mng(struct mlx5_dev_ctx_shared *sh) } mem_mng = (struct mlx5_counter_stats_mem_mng *)(mem + size) - 1; size = sizeof(*raw_data) * MLX5_COUNTERS_PER_POOL * raws_n; - mem_mng->umem = mlx5_os_umem_reg(sh->cdev->ctx, mem, size, - IBV_ACCESS_LOCAL_WRITE); - if (!mem_mng->umem) { - rte_errno = errno; - mlx5_free(mem); - return -rte_errno; - } - memset(&mkey_attr, 0, sizeof(mkey_attr)); - mkey_attr.addr = (uintptr_t)mem; - mkey_attr.size = size; - mkey_attr.umem_id = mlx5_os_get_umem_id(mem_mng->umem); - mkey_attr.pd = sh->cdev->pdn; - mkey_attr.relaxed_ordering_write = sh->cmng.relaxed_ordering_write; - mkey_attr.relaxed_ordering_read = sh->cmng.relaxed_ordering_read; - mem_mng->dm = mlx5_devx_cmd_mkey_create(sh->cdev->ctx, &mkey_attr); - if (!mem_mng->dm) { - mlx5_os_umem_dereg(mem_mng->umem); + ret = mlx5_os_wrapped_mkey_create(sh->cdev->ctx, sh->cdev->pd, + sh->cdev->pdn, mem, size, + &mem_mng->wm); + if (ret) { rte_errno = errno; mlx5_free(mem); return -rte_errno; @@ -7934,7 +7921,7 @@ mlx5_flow_query_alarm(void *arg) ret = mlx5_devx_cmd_flow_counter_query(pool->min_dcs, 0, MLX5_COUNTERS_PER_POOL, NULL, NULL, - pool->raw_hw->mem_mng->dm->id, + pool->raw_hw->mem_mng->wm.lkey, (void *)(uintptr_t) pool->raw_hw->data, sh->devx_comp,