From patchwork Wed Dec 14 23:21:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Creeley X-Patchwork-Id: 13073681 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 A3630C4332F for ; Wed, 14 Dec 2022 23:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229913AbiLNXYk (ORCPT ); Wed, 14 Dec 2022 18:24:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbiLNXX7 (ORCPT ); Wed, 14 Dec 2022 18:23:59 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2050.outbound.protection.outlook.com [40.107.243.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 662B4537EE; Wed, 14 Dec 2022 15:22:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aD2pYOsGkMWJOeNKKU7vvD8dW0YwCqdglCHtTZxtaH8fgOqNsquVY+MKUj3CsgDkB6kAJwTg7zINXkz7QaHjGEJjChVhVsORLyCUnAaR6GQmt5/Hlz4ypG93by76CtM19Ie1uLgAxLe2eAwj7ifpnHqr4uvnN3h/ZCq9DUy/dwkHckzziiYz5//NMuouAWb139lyF+qhoCxg97jxFHy9JZsekiZ6pWlEhGd9k9OFpl7KCgqmLK+s8gQNMHvEfe9AXh3WM6tFoaSMjzXepHseVqN+/cpeMDZZTUToFlJpliYsiziMlJOrF7ed3UyA4mXZHauF7935T2pt1D/w44+bcg== 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=jj8mZ7ZQ/4casth4mNYuusoJLb23I2HP5dqxRci1shU=; b=M4/ns6ENuMWTJ7t8xRv/ZW29N4YXI3Eyj1hvj4KtQA6ztDYyeQHMQIh1wi4N3lFw0GWWevIJDMmFRiNQ5YUid0z9B5hMEBuMGry19mg3IdePNLN9q8qGvNYsYJeraQ+i96IHm4K4m6yrf2VJOkCugy9h3FAjWfpnkAqojdL6uUPGLi9ky5PTdqsxAX2/Hc/YAMDbzgnwuSdCEDQalvK8NExMsFCwLrlzZmqrEs2GSluK8HoUje9xPJ9RPItLktNMF1RPu8IL1GFp+nBDilJ5oKb/8yoFWwOv5fqGU3jy5lHNA97XGH5uMQXWwlWfHlSAgoHn47d+lZRClQeN9MCWIw== 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=jj8mZ7ZQ/4casth4mNYuusoJLb23I2HP5dqxRci1shU=; b=uy9fgjkveJyx9bZRtylFOc+p2h1kz9sElzzMiWVTDsbdLXTntMq5HiyZJuw5ReV9UAQvQIVC2vdSkPUWzDdOGYVWOqM9TJmKC8++RS6oahIQZfajx5w2SyeVAqvNDvcNC+OFygV4j9QzzL6Ip988APiUnig83LxDjEHJh7JU/NI= Received: from BN9PR03CA0645.namprd03.prod.outlook.com (2603:10b6:408:13b::20) by IA1PR12MB8360.namprd12.prod.outlook.com (2603:10b6:208:3d8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 23:22:03 +0000 Received: from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::3f) by BN9PR03CA0645.outlook.office365.com (2603:10b6:408:13b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11 via Frontend Transport; Wed, 14 Dec 2022 23:22:03 +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 BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5924.12 via Frontend Transport; Wed, 14 Dec 2022 23:22:03 +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, 14 Dec 2022 17:21:59 -0600 From: Brett Creeley To: , , , , , , , CC: , , Brett Creeley Subject: [RFC PATCH v2 vfio 4/7] vfio: Commonize combine_ranges for use in other VFIO drivers Date: Wed, 14 Dec 2022 15:21:33 -0800 Message-ID: <20221214232136.64220-5-brett.creeley@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221214232136.64220-1-brett.creeley@amd.com> References: <20221214232136.64220-1-brett.creeley@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT009:EE_|IA1PR12MB8360:EE_ X-MS-Office365-Filtering-Correlation-Id: 687d438e-8a26-4f55-611d-08dade2a021d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FoaGIs32mvitgxvCsg2CfHQ3xqyg3HdDHhIlONagF1y5lioh1cEmQ8pX2rfFWFp0uopP1T8OZh1Mr3VRGADfLBWb1n4IdkZzjs8MlYl0JVb9XOKllA3+nZp3MJupoljpP04KS4Npw/T1vx9Ar9nKUMaxE5oGPtzObi57h0raAENw7roSeVnvqr6NCYAzD5r9xpTQFmtgK4QRCAk5kXOlXyC6Q0cD0wf0X9ETt0pNAGLBA5JguOS1ZSC2L8C9uMWbrYU+/JdEkorq+Jl1xryZQzQE/uYCTlQcO6EB634NV2aJaWKrSLu0HClq0VFO/NWC8KQiwKtnOrFUYUUkt15bKP+lFbNfnRMOmmWVXBD4gt3S1oM2Fvi1Yw9jpxzdzHashIGa1T905c3Jpo7tu1dJGjGz/zKKTVe2hqrlg4AX6stenOjyt4j8pxjsDQohnQlQk6cTmab5GIfp0rk0dl/n3CJSwhvA8Ngdp7K4h1MPlD6AEtwkxS5gQCFHQA5KLzS3+ruTB44U28XDQLgSM0VQm8ozUKpolrx3xwoOXL+HIcuuS3cXdbFEeYbfMLpFHc6BllQDVPj2cvup/CG+wbQbM1eK6Lcg4txqUphHS27epas7fvDPYbB8VvL3b0EcRyYWSaYG+noOQbfK3aiqdl6nZsAljFIYsfz3DholW5USBkAzjjZFVDB1axcamxRZM5aRej4GTln/6aWvl57DMxdpfjLhAdXHkzFXvtRAakEOr10= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:CA;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(376002)(396003)(136003)(39860400002)(346002)(451199015)(40470700004)(36840700001)(46966006)(478600001)(8936002)(47076005)(6666004)(4326008)(426003)(2906002)(8676002)(82310400005)(36756003)(2616005)(186003)(5660300002)(44832011)(26005)(40480700001)(356005)(40460700003)(41300700001)(81166007)(1076003)(86362001)(36860700001)(82740400003)(83380400001)(54906003)(336012)(110136005)(16526019)(316002)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 23:22:03.1350 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 687d438e-8a26-4f55-611d-08dade2a021d 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: BN8NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8360 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-State: RFC 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 c604b70437a5..bf620d339d82 100644 --- a/drivers/vfio/pci/mlx5/cmd.c +++ b/drivers/vfio/pci/mlx5/cmd.c @@ -425,52 +425,6 @@ int mlx5vf_cmd_load_vhca_state(struct mlx5vf_pci_core_device *mvdev, return err; } -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) @@ -493,7 +447,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 6e8804fe0095..67edace75785 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -1293,6 +1293,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 fdd393f70b19..90d4fb3f155c 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -196,6 +196,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 */