From patchwork Thu Jul 18 10:32:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paneer Selvam, Arunpravin" X-Patchwork-Id: 13736353 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C9A9C3DA60 for ; Thu, 18 Jul 2024 10:33:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 397A310E71E; Thu, 18 Jul 2024 10:33:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="WTADr1Mo"; dkim-atps=neutral Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C05710E71A; Thu, 18 Jul 2024 10:33:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hRI14IsAOhBXKnYcjqeG+K04SuKmkuui+5tF9NhuM1LWcDcO7WLBKy5oUUoZmU28CktxV9uZsGtLStAYr1YR7+P+IGS1BZmHaOhOaBCjj9W1MC6UTpNQ/jV87vd0z3DisSKR1budCnARF6rHyA/BW+8t6e4ij4kXTut70a0xO7eT2y3tgmOSCVqiJBRvN4F/U7R0Wlrodkp0sPJEZPnTpcDB2xNubGphFLApflUREAfPKLZzC24uLDu0enm/YfwIKzz+ljYLJ4SPHwUwUvJrTFrfuX7eVN1jnzG9ZOO1xpp0tOAFGlqIEaUQ0tgIATDZQQ9hv045/bz8kDhjIgWmWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=bmGQnREBrqpjhoMUWsxJ9lF5y8O3G8+D6U9zDc5FJRY=; b=xA1LVZ8E02s/IiyEE5o2HrFvxT6oSY52ktbUbQ0MbeU9Gm4Le0pQLvuzLfK9eWnLEn0o+R3Hm+FFNhnw8+wYsj8FRhHn3uknEIcC59eH3TJA9kM3EyAmQqaDroIDCOwUrfHxnxCFlfUdYbgSw+0LzlnYZSug4iR0cyjHCivDmlIighILiHXzH5FFJjUYpWrUXKN/k8qziIMwV9Tegf+PBs/qgwoxQnwpgoZXIRIQeM4TDgONA/rsxtt15vDnFAVgoLvTMTroxdX4DfFxD8Ey2xVwFIAeELqVETgpTG3zQTkyefl/G/sSNqPJ3spvmQohzHfsEB0thmzXWzHvkB6sSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.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 (0) 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=bmGQnREBrqpjhoMUWsxJ9lF5y8O3G8+D6U9zDc5FJRY=; b=WTADr1MoVUlzurQwbyuy27g6DSDZyzQ8OOwN4Z3vmcR+JyW/+dz133lQHxY1StAyUB+1/v1YGgLP2TdU8pMuRs1qIbrGaSaN8R60sjQqH12nCj4sUkW9HiDl5aQl9tcbNQGMCGqY3QdxFxHJb7ZPg/di9uJTGW5IlnhA9EmQlzo= Received: from SA0PR11CA0190.namprd11.prod.outlook.com (2603:10b6:806:1bc::15) by IA1PR12MB8335.namprd12.prod.outlook.com (2603:10b6:208:3fa::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Thu, 18 Jul 2024 10:33:00 +0000 Received: from SA2PEPF00003F64.namprd04.prod.outlook.com (2603:10b6:806:1bc:cafe::17) by SA0PR11CA0190.outlook.office365.com (2603:10b6:806:1bc::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29 via Frontend Transport; Thu, 18 Jul 2024 10:33:00 +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 SA2PEPF00003F64.mail.protection.outlook.com (10.167.248.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7784.11 via Frontend Transport; Thu, 18 Jul 2024 10:33:00 +0000 Received: from amd-X570-AORUS-ELITE.amd.com (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.2507.39; Thu, 18 Jul 2024 05:32:57 -0500 From: Arunpravin Paneer Selvam To: , , , CC: , , , , Arunpravin Paneer Selvam Subject: [PATCH v6 1/2] drm/buddy: Add start address support to trim function Date: Thu, 18 Jul 2024 16:02:42 +0530 Message-ID: <20240718103243.1241392-1-Arunpravin.PaneerSelvam@amd.com> X-Mailer: git-send-email 2.25.1 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: SA2PEPF00003F64:EE_|IA1PR12MB8335:EE_ X-MS-Office365-Filtering-Correlation-Id: fb82938c-be76-45c4-e47a-08dca714ff4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?IbMDXM9614kut6h65YqH3m0Y3uks+w1?= =?utf-8?q?eU8c3JGvTUZ9Qxqg4peHhsb9wLW0c0dXk9HyMQnG4gnmdH5B7OdJXpoe3ay42bTjV?= =?utf-8?q?Dp3DKy6Rk8+8plfahgIHZcrALWrOmw0We0TAg0uZSUCXyrzKw8m5mjfG9G8mPV4nK?= =?utf-8?q?+BHcEtdyEHbieafDWJOPu84RygXnpKh3pydO2+zk+XqcU6xpyogIoeRRIzENRUm5E?= =?utf-8?q?Cd/IBG+tO/AB/zF1HWTNgKpaO0ycFiQZ/NIT9+d5P/9WNINbKR6ecNy16Vjh5unMf?= =?utf-8?q?UbZVTF4+jDI/puTkM9bsf5RSz+SBFVMU0u8qckbLUzU8Md+pFUU95+/BqbOfqsA+G?= =?utf-8?q?/1uWP+sfvsF2gKR1JbtSdW7o/bCLUr+B21Kz7HpZNGolCnlLgPgfB8WfVQiLip0GJ?= =?utf-8?q?h93erJZF7JN804TZ6dEZM3/iv6UX11+MdecwDsXB4By9Nk+ogiO0EnZ8GXLmD0PeS?= =?utf-8?q?PwZvQQRoyN5DuXnxcgwhpKD3/iYIekixKuLom9oL8ZnfJ/jDlTyRco3BacK/OH0up?= =?utf-8?q?6Q6Prw6uWKRhWEOG1xQXyYvhV1qoRMADbY1ipVgEoa0rA62c/BH407HHyFb8RqXLs?= =?utf-8?q?GwWz7HAIUKx86WGmIvBVpaz6zP3ikpixwmYHTiJO/nLT+/NZdJ+rqJ77iayeChHJ1?= =?utf-8?q?ar5D4WFDP2Sq9wox0U1Y+XyLSwQeFZHuQ6TWX/aWK4U1wL+FRRrcxh3SkIs3u445r?= =?utf-8?q?omXeFaZ5CTApuQ28jCFrhe8nn5V0gSl4IwA1DqISzfGFDGlKBdEXPFujZqJeQxAkR?= =?utf-8?q?WoTYV6oatVYTrnAbORjL/C/1EmC4BvQgGip7x4kug3IwV1+1fNiemNZt3pW68WRSs?= =?utf-8?q?dX4vMbtj+4/8YeaBf+jAfAY1jE4VsGlpIy68YEyLjKqQqGE5DSAlDZb1ktR/EmRiN?= =?utf-8?q?uGE6TblwMITZYZaOHMTFGX7sk3aHHKapIpVF16uYECKPgKtK+8drwrewiSf9WCAjQ?= =?utf-8?q?JFdvIgrYyy9IPTVf5AJ3oaC+3bMZUmhjRjYdQH5uJMeW/sspz7so+vechwBK0IHDQ?= =?utf-8?q?OdaF5X/VlNJ6SJNI79IBF00upNFhyVHUyPyBxvCbhF6XL5AgezdjtZ94YqH63L6+H?= =?utf-8?q?i7pZ4ESrzBfbjyh4WJoQGO4pADX+o3z1RB43CeRiObG9wjrdatYaiaf+r3hFzumZc?= =?utf-8?q?8lxTyO7jZN1nUyF59i1TDpXe3Eeq+O59dT/vCBaphtXb+eSZ7gXWgwfK2x2JCau0o?= =?utf-8?q?gbAt08yhlFCq8OJNMqb5xrJgkhFRDO4TTuCy81U3iRoUjIfpcJiZhJFcG80YbpLTE?= =?utf-8?q?LYfEWR6OjsL5Z22AmpAnod6xh8VEPxQ2QVZ+BXVkVqi9FOKSYbxYAo6BdntZrj3pg?= =?utf-8?q?lTjGATd3BzoYv+x63Gcd+8mSXEuRYm8nsF/g2nG3ohogJWHZSYdKkGkMTds/8c6Xh?= =?utf-8?q?IDk0DnWQkKT?= 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:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2024 10:33:00.3712 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb82938c-be76-45c4-e47a-08dca714ff4c 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: SA2PEPF00003F64.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8335 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" - Add a new start parameter in trim function to specify exact address from where to start the trimming. This would help us in situations like if drivers would like to do address alignment for specific requirements. - Add a new flag DRM_BUDDY_TRIM_DISABLE. Drivers can use this flag to disable the allocator trimming part. This patch enables the drivers control trimming and they can do it themselves based on the application requirements. v1:(Matthew) - check new_start alignment with min chunk_size - use range_overflows() Signed-off-by: Arunpravin Paneer Selvam Acked-by: Alex Deucher Acked-by: Christian König --- drivers/gpu/drm/drm_buddy.c | 25 +++++++++++++++++++++++-- drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +- include/drm/drm_buddy.h | 2 ++ 3 files changed, 26 insertions(+), 3 deletions(-) base-commit: 66d3fbb024886f8fbbc15fe79222f046cccd18c7 diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index 6a8e45e9d0ec..103c185bb1c8 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -851,6 +851,7 @@ static int __alloc_contig_try_harder(struct drm_buddy *mm, * drm_buddy_block_trim - free unused pages * * @mm: DRM buddy manager + * @start: start address to begin the trimming. * @new_size: original size requested * @blocks: Input and output list of allocated blocks. * MUST contain single block as input to be trimmed. @@ -866,11 +867,13 @@ static int __alloc_contig_try_harder(struct drm_buddy *mm, * 0 on success, error code on failure. */ int drm_buddy_block_trim(struct drm_buddy *mm, + u64 *start, u64 new_size, struct list_head *blocks) { struct drm_buddy_block *parent; struct drm_buddy_block *block; + u64 block_start, block_end; LIST_HEAD(dfs); u64 new_start; int err; @@ -882,6 +885,9 @@ int drm_buddy_block_trim(struct drm_buddy *mm, struct drm_buddy_block, link); + block_start = drm_buddy_block_offset(block); + block_end = block_start + drm_buddy_block_size(mm, block); + if (WARN_ON(!drm_buddy_block_is_allocated(block))) return -EINVAL; @@ -894,6 +900,20 @@ int drm_buddy_block_trim(struct drm_buddy *mm, if (new_size == drm_buddy_block_size(mm, block)) return 0; + new_start = block_start; + if (start) { + new_start = *start; + + if (new_start < block_start) + return -EINVAL; + + if (!IS_ALIGNED(new_start, mm->chunk_size)) + return -EINVAL; + + if (range_overflows(new_start, new_size, block_end)) + return -EINVAL; + } + list_del(&block->link); mark_free(mm, block); mm->avail += drm_buddy_block_size(mm, block); @@ -904,7 +924,6 @@ int drm_buddy_block_trim(struct drm_buddy *mm, parent = block->parent; block->parent = NULL; - new_start = drm_buddy_block_offset(block); list_add(&block->tmp_link, &dfs); err = __alloc_range(mm, &dfs, new_start, new_size, blocks, NULL); if (err) { @@ -1066,7 +1085,8 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm, } while (1); /* Trim the allocated block to the required size */ - if (original_size != size) { + if (!(flags & DRM_BUDDY_TRIM_DISABLE) && + original_size != size) { struct list_head *trim_list; LIST_HEAD(temp); u64 trim_size; @@ -1083,6 +1103,7 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm, } drm_buddy_block_trim(mm, + NULL, trim_size, trim_list); diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c index fe3779fdba2c..423b261ea743 100644 --- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c @@ -150,7 +150,7 @@ static int xe_ttm_vram_mgr_new(struct ttm_resource_manager *man, } while (remaining_size); if (place->flags & TTM_PL_FLAG_CONTIGUOUS) { - if (!drm_buddy_block_trim(mm, vres->base.size, &vres->blocks)) + if (!drm_buddy_block_trim(mm, NULL, vres->base.size, &vres->blocks)) size = vres->base.size; } diff --git a/include/drm/drm_buddy.h b/include/drm/drm_buddy.h index 2a74fa9d0ce5..9689a7c5dd36 100644 --- a/include/drm/drm_buddy.h +++ b/include/drm/drm_buddy.h @@ -27,6 +27,7 @@ #define DRM_BUDDY_CONTIGUOUS_ALLOCATION BIT(2) #define DRM_BUDDY_CLEAR_ALLOCATION BIT(3) #define DRM_BUDDY_CLEARED BIT(4) +#define DRM_BUDDY_TRIM_DISABLE BIT(5) struct drm_buddy_block { #define DRM_BUDDY_HEADER_OFFSET GENMASK_ULL(63, 12) @@ -155,6 +156,7 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm, unsigned long flags); int drm_buddy_block_trim(struct drm_buddy *mm, + u64 *start, u64 new_size, struct list_head *blocks);