From patchwork Wed Mar 22 20:34:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Creeley X-Patchwork-Id: 13184658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E43F0C6FD1F for ; Wed, 22 Mar 2023 20:42:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230365AbjCVUmw (ORCPT ); Wed, 22 Mar 2023 16:42:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231537AbjCVUmX (ORCPT ); Wed, 22 Mar 2023 16:42:23 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5D278C580; Wed, 22 Mar 2023 13:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iB3EuKKgUyNcLiT1WmjD1O4c5mLtLCuT4/kb4r8szaVMWss+CCeQ7BQL2BN0M6dRzgUn35QDVYvWDVuQNFLUw1rJNtNzGE5Xad6vrp5qDUEseMgLS0LQsB99qwF0ivc7MnrH11jpgWxmi563WH/gJU6YxKP1KalvxB5SX2uWHuw5xB21FNjPsWnYZ8/Refk+rJV6z7zR4hT6ZYzo6aKUFstnwChAWwX1PgC7XqmPcKkLLR1LJAEm+BIW7fyHchtgVxgMFNE+voMc3QKPpGCcq0vqBy6Tq0oGq1fd72VSt/X+W1jYVtSC4ta/uvzHCkR03Uh+6TCfWQYRlAxkAWAwDw== 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=bkm5yh0mHvU+8zuMTjsQdO/pkdbEabFFsGDUghJFO0Q=; b=XWKjNH7nn9YeGNVXLCguOXzxVt1ZR95RcYuWje7BIEedlC2g59Lf/dK79cuc4KUtAJ+KPDY8hCHSm6sS/uZAXBnpiWR60vzIMc2dXNgOnoLEKQJB1b2Gj2Lcrl60/jLheKOOlqbA6ayQI2qV7iDX7r2AJcqOgFKvpkZANh0scHgD9d2N5eWACcN7vVw9AuBsywUihEdW4D0xw74p6vA0cblrxG77N+iEJ+YiDPbynQoBWhgGJwcPiQs7aWZA+xPvBuZIcmo5FGwYLFHGaSFMzhyJKPL2WTQFAkec6yyIBwDPPT+2IYax5tRpVHTE9WLjMzfXIS3XpLZOEe9AyNIa0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bkm5yh0mHvU+8zuMTjsQdO/pkdbEabFFsGDUghJFO0Q=; b=EUvsFSpyFblg3QGtcexIOXfZ5xJGOO29AejlhJLX0RU1NJvbNTVPSJKGtVrVXleVP1M+XStUI4vjIdcwiNB4K0cICfEOp8EtCnTmKicPF3yxGoEH4GOQlkor3xechBeb0fwbEq+ijJ30EZNiuk+rKbrDP7Tpq79vb2pHD01GHsA= Received: from BN9PR03CA0347.namprd03.prod.outlook.com (2603:10b6:408:f6::22) by BN9PR12MB5180.namprd12.prod.outlook.com (2603:10b6:408:11d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 20:34:58 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f6:cafe::64) by BN9PR03CA0347.outlook.office365.com (2603:10b6:408:f6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Wed, 22 Mar 2023 20:34:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6222.17 via Frontend Transport; Wed, 22 Mar 2023 20:34:58 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 22 Mar 2023 15:34:57 -0500 From: Brett Creeley To: , , , , , , CC: , , Subject: [PATCH v5 vfio 1/7] vfio: Commonize combine_ranges for use in other VFIO drivers Date: Wed, 22 Mar 2023 13:34:36 -0700 Message-ID: <20230322203442.56169-2-brett.creeley@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230322203442.56169-1-brett.creeley@amd.com> References: <20230322203442.56169-1-brett.creeley@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT032:EE_|BN9PR12MB5180:EE_ X-MS-Office365-Filtering-Correlation-Id: 9330e4ee-33e4-4820-65ea-08db2b14e770 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qwxl5v9nTJP+BhTm7z0cYAa0jGSTnZosph/QGcA76hBFda+9kIGZSKQqLQk1/SKpOWGniroucyvfg7UGIVdPboiE47fXIHSUnkpz8C+zBuEp+Wyn+w8CU1vj46Tskq62dSOshhdl2kvOyh4/liRFXLKJsSP5IQ6BMU14QVdkCkaLf8rmEOi3VKHX0sZ2XcMuqzPhenqcEvkUTaiAFkI1+3vzZIWMxuuNOT/opwfOVuZynujO6UV1wge6CqUakNyLJa9boby4gFW9gfeFeTCtI6J/zBSZimGWJiif3+B36Qz54or5izRe53ICEk1kTyXXxMySJNc6C4uoO8+rcBBHBja9KdeGo/eQAEBHBYPyjEFXLiSjbFhjoQfvWx4B6h18eNKVMsXcCL6C3le6dG+WlynC03jTD5U44QKrw7whguulhO0LptkvK55WUFsjOtLI0tDavgIuXUkvj2iKszWHOsHkSwTDqeO/uZipR+63YqFeExIoh6lQ107HUDOuK+FxOdGQZtCsmTz9MenktgQnZn6c6EY3wkFN8s7wBwxq6zxH4yeSJpcqNSJsvjquhkrtYRa5QY4o/5ZXvD0yGezGVq8aRnJz/gQReMbigVtlobw/yEvVOAW5oHUtfU+5OLNakkF6DUSz+1nhWXJSS0TtfbfPwHTE/o8AufN9RBgXZGa/kTVyvatFIOH9fDjRVjWS8+AReT6qdYkkoQiGNb77y6DZL+6XuJM4nomB9pXTf+s= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(346002)(396003)(376002)(136003)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(66899018)(81166007)(82740400003)(36860700001)(36756003)(86362001)(70206006)(110136005)(478600001)(40480700001)(54906003)(316002)(356005)(426003)(336012)(40460700003)(47076005)(83380400001)(2616005)(6666004)(1076003)(16526019)(26005)(186003)(8936002)(8676002)(5660300002)(70586007)(2906002)(44832011)(41300700001)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 20:34:58.4519 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9330e4ee-33e4-4820-65ea-08db2b14e770 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5180 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Currently only Mellanox uses the combine_ranges function. The new pds_vfio driver also needs this function. So, move it to a common location for other vendor drivers to use. Cc: Yishai Hadas Signed-off-by: Brett Creeley Signed-off-by: Shannon Nelson --- drivers/vfio/pci/mlx5/cmd.c | 48 +------------------------------------ drivers/vfio/vfio_main.c | 48 +++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 3 +++ 3 files changed, 52 insertions(+), 47 deletions(-) diff --git a/drivers/vfio/pci/mlx5/cmd.c b/drivers/vfio/pci/mlx5/cmd.c index deed156e6165..7f6c51992a15 100644 --- a/drivers/vfio/pci/mlx5/cmd.c +++ b/drivers/vfio/pci/mlx5/cmd.c @@ -732,52 +732,6 @@ void mlx5fv_cmd_clean_migf_resources(struct mlx5_vf_migration_file *migf) mlx5vf_cmd_dealloc_pd(migf); } -static void combine_ranges(struct rb_root_cached *root, u32 cur_nodes, - u32 req_nodes) -{ - struct interval_tree_node *prev, *curr, *comb_start, *comb_end; - unsigned long min_gap; - unsigned long curr_gap; - - /* Special shortcut when a single range is required */ - if (req_nodes == 1) { - unsigned long last; - - curr = comb_start = interval_tree_iter_first(root, 0, ULONG_MAX); - while (curr) { - last = curr->last; - prev = curr; - curr = interval_tree_iter_next(curr, 0, ULONG_MAX); - if (prev != comb_start) - interval_tree_remove(prev, root); - } - comb_start->last = last; - return; - } - - /* Combine ranges which have the smallest gap */ - while (cur_nodes > req_nodes) { - prev = NULL; - min_gap = ULONG_MAX; - curr = interval_tree_iter_first(root, 0, ULONG_MAX); - while (curr) { - if (prev) { - curr_gap = curr->start - prev->last; - if (curr_gap < min_gap) { - min_gap = curr_gap; - comb_start = prev; - comb_end = curr; - } - } - prev = curr; - curr = interval_tree_iter_next(curr, 0, ULONG_MAX); - } - comb_start->last = comb_end->last; - interval_tree_remove(comb_end, root); - cur_nodes--; - } -} - static int mlx5vf_create_tracker(struct mlx5_core_dev *mdev, struct mlx5vf_pci_core_device *mvdev, struct rb_root_cached *ranges, u32 nnodes) @@ -800,7 +754,7 @@ static int mlx5vf_create_tracker(struct mlx5_core_dev *mdev, int i; if (num_ranges > max_num_range) { - combine_ranges(ranges, nnodes, max_num_range); + vfio_combine_iova_ranges(ranges, nnodes, max_num_range); num_ranges = max_num_range; } diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 43bd6b76e2b6..49f37c1b4932 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -864,6 +864,54 @@ static int vfio_ioctl_device_feature_migration(struct vfio_device *device, return 0; } +void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes, + u32 req_nodes) +{ + struct interval_tree_node *prev, *curr, *comb_start, *comb_end; + unsigned long min_gap; + unsigned long curr_gap; + + /* Special shortcut when a single range is required */ + if (req_nodes == 1) { + unsigned long last; + + comb_start = interval_tree_iter_first(root, 0, ULONG_MAX); + curr = comb_start; + while (curr) { + last = curr->last; + prev = curr; + curr = interval_tree_iter_next(curr, 0, ULONG_MAX); + if (prev != comb_start) + interval_tree_remove(prev, root); + } + comb_start->last = last; + return; + } + + /* Combine ranges which have the smallest gap */ + while (cur_nodes > req_nodes) { + prev = NULL; + min_gap = ULONG_MAX; + curr = interval_tree_iter_first(root, 0, ULONG_MAX); + while (curr) { + if (prev) { + curr_gap = curr->start - prev->last; + if (curr_gap < min_gap) { + min_gap = curr_gap; + comb_start = prev; + comb_end = curr; + } + } + prev = curr; + curr = interval_tree_iter_next(curr, 0, ULONG_MAX); + } + comb_start->last = comb_end->last; + interval_tree_remove(comb_end, root); + cur_nodes--; + } +} +EXPORT_SYMBOL_GPL(vfio_combine_iova_ranges); + /* Ranges should fit into a single kernel page */ #define LOG_MAX_RANGES \ (PAGE_SIZE / sizeof(struct vfio_device_feature_dma_logging_range)) diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 93134b023968..10db5aa3e985 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -241,6 +241,9 @@ int vfio_mig_get_next_state(struct vfio_device *device, enum vfio_device_mig_state new_fsm, enum vfio_device_mig_state *next_fsm); +void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes, + u32 req_nodes); + /* * External user API */