Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp3560641rdh; Thu, 28 Sep 2023 15:59:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGi/QjQbaSZ6LrCb4sqzSHiykc8IFn9ERXR5Nkl+w3Qr4B7pkBgFhZk7XQY/A9g4kSryq6v X-Received: by 2002:a05:6a00:1bc5:b0:68f:c1e0:a2c4 with SMTP id o5-20020a056a001bc500b0068fc1e0a2c4mr3723423pfw.3.1695941951224; Thu, 28 Sep 2023 15:59:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695941951; cv=pass; d=google.com; s=arc-20160816; b=IUkaYHdZfKiM8A0a57omvBYwJNF2Cc1K6bLHS5HteA/IYMQp9fm/+q5T9yi6ztsgqC PMypQdOkYfVHvjMvU0sSC2geo00bgPRevxyXPXMSAi6LAwvXpZp5TYyRKz8alUmDi5PQ Fvts1MS6zjHGZal56EFZVTgkNHgqoDpnkgwwKMGtdTOfo46iOeUNHd1N9uViTmc04NXs cCo+pDZy3XQO7Ixf57+jPCo4yJL4ewaQk8iJFEAXssfAvd7FcAWSRPVJ0JyGls6H254E ZUC2SOCwV4IRkBxyMmteOjsVdVbwZczRCgr3xJil2oTlmg9FzYOdGVvyNffXXPaFv20Z lbpw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pugKhXn1yyJ2eySbGpZefWpS3s+uIziF5TphRI58E5w=; fh=4SYmPDx0sMrYC0lSOUfhTOMEzVMfG5iPEyPqlL4Bs2M=; b=BYkySk4ROExmMKsfyLmqQOjhELPwq19FLdGOB7l843ZicSGzUyO0HM1mEsV8BWBHaj bN/Z9BSkJUBiERlCKAzCl77Jwk//6ce8MHJy1CtwaJwQ77b4m1FI5WlP6U7ZEA7rA6Aj O+pqDIC31KDdzqXvLmxqdTvC60ntqjufZ6C20p8hi+xmXl8Gx8KEzNUq9qlWlfaZU4YC GdqgA5HJ2ZyU9ehpFcJgTupbsqtfwp/Vb340Xe8WGCWE4Mly9qvBEdWOVdJcs3DvZJSU 92nThm0nqZwwlp9J5TSzuljqOBttEQRPlUQJyNgCWiw06qNhVZfDt/8ZqYII3QbfQUfy jldg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=cjBZTUUu; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id bs193-20020a6328ca000000b005526bd0c526si18452841pgb.641.2023.09.28.15.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 15:59:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@Nvidia.com header.s=selector2 header.b=cjBZTUUu; arc=pass (i=1 spf=pass spfdomain=nvidia.com dmarc=pass fromdomain=nvidia.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=nvidia.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 12AFE8042854; Thu, 28 Sep 2023 09:51:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232086AbjI1Quv (ORCPT + 99 others); Thu, 28 Sep 2023 12:50:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232070AbjI1Qua (ORCPT ); Thu, 28 Sep 2023 12:50:30 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D92DCFD for ; Thu, 28 Sep 2023 09:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvgYBte1eOu0UBDgUh+8ODgy48ddEN03y+E9wEDZLwa+BlnqD4pSqCSWgGgH1rEBGKfVVySRspvVCn2ufSAadOjL5XHthg3vSlHvqkkwGc5MNLSNHv7MpQZdyg11sVXorjOC4ctNCYf3egNn5fQHOqQJuH8PjekPybt0QaDIFtP3FCIYaGXgkzYpZehVKXjtOed7bGIQb5LBzvTVfL2s9rNkrCpD6Uzwi4eL9HXkDySstpz0AWdh7RFZuYS64Pc+qkdcAmm3NEwWlvowKPAKpiWNQkxSKKaeGUWCVUZuAVCGM3eDFF+V92noJPpIPuEyAxIhDCzyNfR3kMjmGmpe0Q== 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=pugKhXn1yyJ2eySbGpZefWpS3s+uIziF5TphRI58E5w=; b=YHyvHb+8frVH2OJZnrRW+ysYrZu1OP3+kVsAFpbzJ+Zvkd1xK3yv6B6M02M8R/prerV0DMYUuyQdAhWKzTxS9iYq5hJHsdZtb1txx85ob513wEHa9blzdfzgz/qYhhbbObT7jw07U7nCghXr79MlV+5AxShtW1JlTj6/B8+61VzKoNAYnGkx+poo0kzBfTnLZ9YKcr0aeAy8QF7w5PjGuB5g1GrYf+3cyures4rYGBm/1zQ2UPbOJosB0re4gXL1SufK+Pqee5mcQnsU8iGRKQISeHSjpF2PHc9l6TwRJ6JMZ43C5pJ2E5W9EgPmmIlfgb3Vo3H3/XUB6a+AeqFYpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=redhat.com 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=pugKhXn1yyJ2eySbGpZefWpS3s+uIziF5TphRI58E5w=; b=cjBZTUUusX34zRWyErUREsLDQOigKqUQnirQrYCZMVucfQbJ5uLXqhCeCPzXyRmPPtTj8u08s1bkDOe6rcHbIiBn3G6pbfAq4f/byCePafn7tT3wAPARzvzzEm+5jxvvKudmFeKPZw87izA4QDKVPnBbzwwdaOr08iHZ8nb+DIGJHu9XUSkstvIJ760sZb/hJ8DEdhc1GiAvjrH7t98NDHu4o/18Zgwbt2c3fbU8fpJD+Cq4+7uN4D799Bo77N7L8ioGxZRfqNezazkgXpTRDfRh/s4/YQk6HoQOCtcf9Gvvm0PiISA6bFz59+/YmaAjsJmslBz/CobRRH0JPO/STg== Received: from MW4P223CA0023.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::28) by DS0PR12MB8766.namprd12.prod.outlook.com (2603:10b6:8:14e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Thu, 28 Sep 2023 16:50:09 +0000 Received: from CO1PEPF000044FC.namprd21.prod.outlook.com (2603:10b6:303:80:cafe::83) by MW4P223CA0023.outlook.office365.com (2603:10b6:303:80::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 16:50:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1PEPF000044FC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.9 via Frontend Transport; Thu, 28 Sep 2023 16:50:09 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 28 Sep 2023 09:49:58 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 28 Sep 2023 09:49:58 -0700 Received: from c-237-113-220-225.mtl.labs.mlnx (10.127.8.12) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Thu, 28 Sep 2023 09:49:56 -0700 From: Dragos Tatulea To: , , "Michael S . Tsirkin" , Jason Wang , Xuan Zhuo CC: , Dragos Tatulea , Subject: [PATCH vhost 11/16] vdpa/mlx5: Move mr mutex out of mr struct Date: Thu, 28 Sep 2023 19:45:22 +0300 Message-ID: <20230928164550.980832-13-dtatulea@nvidia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928164550.980832-2-dtatulea@nvidia.com> References: <20230928164550.980832-2-dtatulea@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FC:EE_|DS0PR12MB8766:EE_ X-MS-Office365-Filtering-Correlation-Id: cd71045f-783c-486a-fd41-08dbc042f9b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4otg5Ue9/XaMs9MDhxqT3Rx0GB80C8kjBAHDhgtCEIQ8Jwds2w2XyMPTewtcHuv+fyNtvH8+UU+PnP2c/6c0Mtrx+HiaIyoH+Pg5XBLO64/8YrqkCpgKsWPzIp1l3i0GGd3Xdk7RssFeOBQJeLSbu+CzICp3kori9NtTp9lJrBuCuZoI/LTu/ynPuk5xqDjyolVhGQUs+wXZBnngNYnm0KvY5xrMJhVhmP82KpwVXakcv0+qeHMPJCxwqbI5To/FdAmrOszQW6D4aLdzgq6emg1Jm/lwOwPwZ48Ru5ZOrCaLcDbCHs4vR+bEAgfIRG6VB7zeqiSOG/DqfMbB/bFFv46qU2jL4kIOsH94gOx/V9w0ZD9Q4RCUPcgwHyvFJyJm55kaa6Kxa75LECTF/sC/SC99js/T+VRzue8knnhqMoe0OfKNpZPCl2JT4G82WJy3EZr13bBrirqlHCLc4ok98PQs28ILDj7LJ34o6nO5MyGAHowiIvnpcY1nGMigAiWoIrk4dp7GixYoIgbcKoZNK/4Z/hm9m380OST0w7+/kqJ5TbptJ23l/LQkmO47IWf0ym8dEwuZud/tnQMxusAiDI5RFr98lJtRQjHKrz8XGSBjSR4EnY0T5c1H7UIWuI9tBZ8/5a13Yf24KOjMlxLqWigx0X/qlP246KhU4ltgi4bgwNj/urgkR/0/cFqWPAamriYinYXM/jzvznzN0ZntNIgxdLZzYsRD/PF9Qfxuh7/cFYiXgAh/b3LrkREW5tVm X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230031)(4636009)(376002)(346002)(136003)(39860400002)(396003)(230922051799003)(82310400011)(64100799003)(1800799009)(451199024)(186009)(36840700001)(46966006)(40470700004)(426003)(47076005)(40460700003)(356005)(2906002)(66899024)(86362001)(5660300002)(82740400003)(7636003)(6666004)(36756003)(83380400001)(478600001)(40480700001)(2616005)(4326008)(1076003)(8936002)(41300700001)(8676002)(110136005)(336012)(26005)(54906003)(70586007)(316002)(36860700001)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 16:50:09.2144 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd71045f-783c-486a-fd41-08dbc042f9b8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8766 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 28 Sep 2023 09:51:08 -0700 (PDT) The mutex is named like it is supposed to protect only the mkey but in reality it is a global lock for all mr resources. Shift the mutex to it's rightful location (struct mlx5_vdpa_dev) and give it a more appropriate name. Signed-off-by: Dragos Tatulea --- drivers/vdpa/mlx5/core/mlx5_vdpa.h | 4 ++-- drivers/vdpa/mlx5/core/mr.c | 13 +++++++------ drivers/vdpa/mlx5/core/resources.c | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/vdpa/mlx5/core/mlx5_vdpa.h b/drivers/vdpa/mlx5/core/mlx5_vdpa.h index 01d4ee58ccb1..9c6ac42c21e1 100644 --- a/drivers/vdpa/mlx5/core/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/core/mlx5_vdpa.h @@ -34,8 +34,6 @@ struct mlx5_vdpa_mr { /* state of dvq mr */ bool initialized; - /* serialize mkey creation and destruction */ - struct mutex mkey_mtx; bool user_mr; }; @@ -94,6 +92,8 @@ struct mlx5_vdpa_dev { u32 generation; struct mlx5_vdpa_mr mr; + /* serialize mr access */ + struct mutex mr_mtx; struct mlx5_control_vq cvq; struct workqueue_struct *wq; unsigned int group2asid[MLX5_VDPA_NUMVQ_GROUPS]; diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c index 6f29e8eaabb1..abd6a6fb122f 100644 --- a/drivers/vdpa/mlx5/core/mr.c +++ b/drivers/vdpa/mlx5/core/mr.c @@ -509,11 +509,11 @@ static void _mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_ void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_mr *mr) { - mutex_lock(&mr->mkey_mtx); + mutex_lock(&mvdev->mr_mtx); _mlx5_vdpa_destroy_mr(mvdev, mr); - mutex_unlock(&mr->mkey_mtx); + mutex_unlock(&mvdev->mr_mtx); } void mlx5_vdpa_destroy_mr_resources(struct mlx5_vdpa_dev *mvdev) @@ -550,9 +550,10 @@ int mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev, { int err; - mutex_lock(&mvdev->mr.mkey_mtx); + mutex_lock(&mvdev->mr_mtx); err = _mlx5_vdpa_create_mr(mvdev, mr, iotlb); - mutex_unlock(&mvdev->mr.mkey_mtx); + mutex_unlock(&mvdev->mr_mtx); + return err; } @@ -563,14 +564,14 @@ int mlx5_vdpa_handle_set_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *io int err = 0; *change_map = false; - mutex_lock(&mr->mkey_mtx); + mutex_lock(&mvdev->mr_mtx); if (mr->initialized) { mlx5_vdpa_info(mvdev, "memory map update\n"); *change_map = true; } if (!*change_map) err = _mlx5_vdpa_create_mr(mvdev, mr, iotlb); - mutex_unlock(&mr->mkey_mtx); + mutex_unlock(&mvdev->mr_mtx); return err; } diff --git a/drivers/vdpa/mlx5/core/resources.c b/drivers/vdpa/mlx5/core/resources.c index d5a59c9035fb..5c5a41b64bfc 100644 --- a/drivers/vdpa/mlx5/core/resources.c +++ b/drivers/vdpa/mlx5/core/resources.c @@ -256,7 +256,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev) mlx5_vdpa_warn(mvdev, "resources already allocated\n"); return -EINVAL; } - mutex_init(&mvdev->mr.mkey_mtx); + mutex_init(&mvdev->mr_mtx); res->uar = mlx5_get_uars_page(mdev); if (IS_ERR(res->uar)) { err = PTR_ERR(res->uar); @@ -301,7 +301,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev) err_uctx: mlx5_put_uars_page(mdev, res->uar); err_uars: - mutex_destroy(&mvdev->mr.mkey_mtx); + mutex_destroy(&mvdev->mr_mtx); return err; } @@ -318,6 +318,6 @@ void mlx5_vdpa_free_resources(struct mlx5_vdpa_dev *mvdev) dealloc_pd(mvdev, res->pdn, res->uid); destroy_uctx(mvdev, res->uid); mlx5_put_uars_page(mvdev->mdev, res->uar); - mutex_destroy(&mvdev->mr.mkey_mtx); + mutex_destroy(&mvdev->mr_mtx); res->valid = false; } -- 2.41.0