From patchwork Tue Jan 11 20:14:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paneer Selvam, Arunpravin" X-Patchwork-Id: 12710608 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 533ABC4321E for ; Tue, 11 Jan 2022 20:15:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED6AA10E665; Tue, 11 Jan 2022 20:15:12 +0000 (UTC) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2059.outbound.protection.outlook.com [40.107.92.59]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9227610E859; Tue, 11 Jan 2022 20:15:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Iwx0vUA1ilFX92TI5MW0bzexz6yMb+vmZjNwMIkC0CeejfqcbCjEKSd8DnDiDv3ibxKZTMAErByygh/y5uiVsY7AeW52aKSosq3Se8dD8Dg7pBBPHRO/jS4tYKSbXQ/aSu9dAYLKjVgb9d2ocNDyOFczTaQw04JrvErQMol0H5YG2jttldiDix8YFyL+rK9kN66ZwKDd7m/hM8Yhr6Iy43LWOcm7yLM9hM4ckyesWx4iiclYmZm4rpyyPW8hob9LNybOQr4qkmX38k9KWl6J8MKE8V6S0tJszkaS93bOiYA25Apvl14VyBe9qWv9C2yo0Tl0BZiE6d9eUf7m65nG3A== 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=sDAwiKRZPWlD9JdDMZkOsNXDO3Hmt+CflZvyBWJyDiE=; b=jq59NXm9b6FaC/X19sWMjaXK6dIRZPmgf59QRP/eTFjJ7RBurLsQ9D/1YartM8YWcaOP8njiLswN+xVW8qr5WSSUt9hFGosi3N9PfNpgeq/l56Kj/soCIdDfxmzsnFNBGHTQAW2RwkcWvNzZmQw66sUTXTC6kxIUfQ5/s0WXlw3TeoZpB0S6s86SWvBUEy1yiQvFZ0TBPFtUkoG10v+GD39xM/a9LEQk/m1ybCKrpcSUiMpXE1FdCkuFYalzeuTNTkJBPdIJ33Y8dbdaCpQH7H8TPHf5e4OLeFPAGG2sH9nGFz3ZVkjfu7/8NJF8LidZBvh25Q8RKetmTJ08zBDjNA== 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 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=sDAwiKRZPWlD9JdDMZkOsNXDO3Hmt+CflZvyBWJyDiE=; b=XQMjTwcoVCQ90UgowxwstsutbP5myr06iE8SJeQ+i8a8s+JQxqfNGHrulTxFXOxOA0KfbwmbEWrlM9anqT9FhPl9TcYUDkkytfQr5E0e2IbIOhzA9Hfu1vL6XE2tbifsO1KJv2yT2wf9IeFI17ihERD2MpCvSk1GpKVAI5pHpLE= Received: from BN9P221CA0021.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::15) by DM6PR12MB4283.namprd12.prod.outlook.com (2603:10b6:5:211::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 20:15:07 +0000 Received: from BN8NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::6b) by BN9P221CA0021.outlook.office365.com (2603:10b6:408:10a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9 via Frontend Transport; Tue, 11 Jan 2022 20:15:06 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT006.mail.protection.outlook.com (10.13.177.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4867.9 via Frontend Transport; Tue, 11 Jan 2022 20:15:06 +0000 Received: from rtg-amd.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.2375.17; Tue, 11 Jan 2022 14:15:02 -0600 From: Arunpravin To: , , Date: Wed, 12 Jan 2022 01:44:34 +0530 Message-ID: <20220111201436.2254399-4-Arunpravin.PaneerSelvam@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111201436.2254399-1-Arunpravin.PaneerSelvam@amd.com> References: <20220111201436.2254399-1-Arunpravin.PaneerSelvam@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-Office365-Filtering-Correlation-Id: 12a3e7f1-c821-4172-6294-08d9d53f0f85 X-MS-TrafficTypeDiagnostic: DM6PR12MB4283:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qQdWrpVpR9sy0vsSg5IRDlEU36P5E1Uc+/hk0hjGVwsF+AQZSxUOswJNnTwatpSWodkpjOpuV3sp9KK65d23XbYV8O+49KP5RP4j7GcdkFAU0ur7l3S1chzV3LGPDU0msIFyKdurX3TPah8mPyQV+2J3vryKY3PPWrpBsJtG8dT7vMAt0HfgMEIFD6YOlDZ+FZqPr+XSUzSuE6zxuEXnZJ2R90S2MKTBWnRTVmJ8v3n1+AALlFopjuhty38PUAuDONdxwpfjN5ySlNn/rKBVL27Qi1+WI1GNQMf+0qFaMoSFBCISHCsB5LV3C6cClHpGJff3RLuUS1xJqF5fPhvMILfIhdvNGxq6ReeRuJEt+4h2D0LBSZBaX8mOwoM7odlQkngVhulxSsdCTEUTPWn5pB5lGj3KTzs2IArYD0UhLQWfLLiIMNiBFTg5lB77QQsL1YmDJQLhNrokS2zt/y7mpZNEaWb01B/3bLzYt7i9tW3v+X6TEUK+556m1XFCS+3j9ECg3zIT7tBUEptHcp18TVnFsgZmj2oQiOzQGMrX68N2WxD16o0QQ/KBSlbYSjkR0mYCFAEnHCJSb4MI11JQoqzX0Sqz7GTBWzOF77Y9nhBwZd+NVZLbLh65Bhccu+uIMDpYOqHxJbEJDPo0jOks2T85pJh3ok0YcKSxf+EUcwxlWNsunYLQtJKYj74c5hXtb1bGVxPgbDweHXlM0cMta+etJV1xwFUveZfmGx4IT9JNQK+4J1JJKGI+awGqpl8W/jMvomy9EEoLzIWGSL9tYQ1yZF86LeX2uhRqFWja+L0= 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:(4636009)(46966006)(36840700001)(40470700002)(26005)(8936002)(8676002)(6666004)(16526019)(47076005)(186003)(83380400001)(356005)(70206006)(70586007)(82310400004)(40460700001)(508600001)(1076003)(316002)(336012)(2616005)(7696005)(110136005)(426003)(2906002)(81166007)(54906003)(5660300002)(4326008)(86362001)(36756003)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 20:15:06.9222 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12a3e7f1-c821-4172-6294-08d9d53f0f85 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: BN8NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4283 Subject: [Intel-gfx] [PATCH v8 4/6] drm: implement a method to free unused pages X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arunpravin , matthew.auld@intel.com, tzimmermann@suse.de, alexander.deucher@amd.com, christian.koenig@amd.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On contiguous allocation, we round up the size to the *next* power of 2, implement a function to free the unused pages after the newly allocate block. v2(Matthew Auld): - replace function name 'drm_buddy_free_unused_pages' with drm_buddy_block_trim - replace input argument name 'actual_size' with 'new_size' - add more validation checks for input arguments - add overlaps check to avoid needless searching and splitting - merged the below patch to see the feature in action - add free unused pages support to i915 driver - lock drm_buddy_block_trim() function as it calls mark_free/mark_split are all globally visible v3(Matthew Auld): - remove trim method error handling as we address the failure case at drm_buddy_block_trim() function v4: - in case of trim, at __alloc_range() split_block failure path marks the block as free and removes it from the original list, potentially also freeing it, to overcome this problem, we turn the drm_buddy_block_trim() input node into a temporary node to prevent recursively freeing itself, but still retain the un-splitting/freeing of the other nodes(Matthew Auld) - modify the drm_buddy_block_trim() function return type v5(Matthew Auld): - revert drm_buddy_block_trim() function return type changes in v4 - modify drm_buddy_block_trim() passing argument n_pages to original_size as n_pages has already been rounded up to the next power-of-two and passing n_pages results noop Signed-off-by: Arunpravin --- drivers/gpu/drm/drm_buddy.c | 65 +++++++++++++++++++ drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 10 +++ include/drm/drm_buddy.h | 4 ++ 3 files changed, 79 insertions(+) diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c index 4cc6e88d8e0d..7ba7123c8aec 100644 --- a/drivers/gpu/drm/drm_buddy.c +++ b/drivers/gpu/drm/drm_buddy.c @@ -540,6 +540,71 @@ static int __drm_buddy_alloc_range(struct drm_buddy *mm, return __alloc_range(mm, &dfs, start, size, blocks); } +/** + * drm_buddy_block_trim - free unused pages + * + * @mm: DRM buddy manager + * @new_size: original size requested + * @blocks: output list head to add allocated blocks + * + * For contiguous allocation, we round up the size to the nearest + * power of two value, drivers consume *actual* size, so remaining + * portions are unused and it can be freed. + * + * Returns: + * 0 on success, error code on failure. + */ +int drm_buddy_block_trim(struct drm_buddy *mm, + u64 new_size, + struct list_head *blocks) +{ + struct drm_buddy_block *parent; + struct drm_buddy_block *block; + LIST_HEAD(dfs); + u64 new_start; + int err; + + if (!list_is_singular(blocks)) + return -EINVAL; + + block = list_first_entry(blocks, + struct drm_buddy_block, + link); + + if (!drm_buddy_block_is_allocated(block)) + return -EINVAL; + + if (new_size > drm_buddy_block_size(mm, block)) + return -EINVAL; + + if (!new_size && !IS_ALIGNED(new_size, mm->chunk_size)) + return -EINVAL; + + if (new_size == drm_buddy_block_size(mm, block)) + return 0; + + list_del(&block->link); + mark_free(mm, block); + mm->avail += drm_buddy_block_size(mm, block); + + /* Prevent recursively freeing this node */ + 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); + if (err) { + mark_allocated(block); + mm->avail -= drm_buddy_block_size(mm, block); + list_add(&block->link, blocks); + } + + block->parent = parent; + return err; +} +EXPORT_SYMBOL(drm_buddy_block_trim); + /** * drm_buddy_alloc_blocks - allocate power-of-two blocks * diff --git a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c index ae9201246bb5..626108fb9725 100644 --- a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c +++ b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c @@ -97,6 +97,16 @@ static int i915_ttm_buddy_man_alloc(struct ttm_resource_manager *man, if (unlikely(err)) goto err_free_blocks; + if (place->flags & TTM_PL_FLAG_CONTIGUOUS) { + u64 original_size = (u64)bman_res->base.num_pages << PAGE_SHIFT; + + mutex_lock(&bman->lock); + drm_buddy_block_trim(mm, + original_size, + &bman_res->blocks); + mutex_unlock(&bman->lock); + } + *res = &bman_res->base; return 0; diff --git a/include/drm/drm_buddy.h b/include/drm/drm_buddy.h index 424fc443115e..17ca928fce8e 100644 --- a/include/drm/drm_buddy.h +++ b/include/drm/drm_buddy.h @@ -145,6 +145,10 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm, struct list_head *blocks, unsigned long flags); +int drm_buddy_block_trim(struct drm_buddy *mm, + u64 new_size, + struct list_head *blocks); + void drm_buddy_free_block(struct drm_buddy *mm, struct drm_buddy_block *block); void drm_buddy_free_list(struct drm_buddy *mm, struct list_head *objects);