Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,RCVD_ILLEGAL_IP,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5213AC433E6 for ; Wed, 2 Sep 2020 03:43:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0FF5420758 for ; Wed, 2 Sep 2020 03:43:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="4T7xmCW7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FF5420758 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE36A6E072; Wed, 2 Sep 2020 03:43:48 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2062.outbound.protection.outlook.com [40.107.220.62]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BFD36E072 for ; Wed, 2 Sep 2020 03:43:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lERWI3GnqemaJXSHh4F6ujC6pXeb/PAwUsN7H3rLVZTxOmdMKGAgf5WUe2o5hIOmvYdNNBOxvowTSLGSWEBZpyES6RngbC/yesqelqNp7wsZFc7JtIvTdWM4eASoD9dJ6RQEUwaNiwmqVNbDWxxFKJS34X8fO+Y0GzR0sHl90tVvG5vkrYSDCOTXs/+5laKtVscbdLMvv+9t8PpGBVvBCZb1K8m7vWR7kUW2sWGsAXym0glnOqsXPMMa+hO4sXfjd+xmt89WMiHQFiMkNEW396qmCTJy3lfkOGXNjo2sCELIQgS4ahw8VsNRTvhEgwF/2Oy6NZmqZhyS32yDRIP9wQ== 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-SenderADCheck; bh=r4oYZiJ6nf4IHd0RjkRK5OYMmWvw3SgvMoK+3niDDkw=; b=T52gFC8zDUx/rq3pzoBbte8sK/ERQLocOuDSZ9rWlJNKDsFDEueLceBYtAO+JBHG3gJbfdsY6bE7bPVpViGmYK/WIzKCMenKhu9cemwWPB+VUD0lK+UC6g62Abc347NP7s9OQh9P69MxQFPGtWIVtdHDX7elGi2LXcIs9gfKkdzv7mkkgIBNWKYFM/SjmGXCWCYUpx0mvXUpbcsmOQG9dozCArGo1yS8KQdip8+ZNy8GuvJW4i7koBHVzdnkCmXi6QutxTD2GkmyORXl3T5fhfRGdE32IdaBg0648KHTOI+dGaIi9T1ar1EWv6WylHQt56PeKvzAYxgoNL9eQzE+gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r4oYZiJ6nf4IHd0RjkRK5OYMmWvw3SgvMoK+3niDDkw=; b=4T7xmCW7zLR8dMi7fKGlh3KoIXKppRDGmExG0WKibgFUdKQArKrx4hJUm8zsMaKwWTwpl2rXLEjU2XQ3aUTnc6bor/WrlOMOl8ip/5mBrAes4ux+AuSGE/xjH2xiNTW5hEdDuP81jOR5RwkRzkMRPigV8q//Nax/KMc0SRcJp4Y= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=amd.com; Received: from SN1PR12MB2558.namprd12.prod.outlook.com (2603:10b6:802:2b::18) by SN6PR12MB2623.namprd12.prod.outlook.com (2603:10b6:805:6f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Wed, 2 Sep 2020 03:43:46 +0000 Received: from SN1PR12MB2558.namprd12.prod.outlook.com ([fe80::c8c0:9bc9:57ed:cb03]) by SN1PR12MB2558.namprd12.prod.outlook.com ([fe80::c8c0:9bc9:57ed:cb03%3]) with mapi id 15.20.3326.025; Wed, 2 Sep 2020 03:43:46 +0000 From: xinhui pan To: amd-gfx@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: Revert "drm/amdgpu: stop allocating dummy GTT nodes" Date: Wed, 2 Sep 2020 11:43:14 +0800 Message-Id: <20200902034314.3987-1-xinhui.pan@amd.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: HK2PR04CA0086.apcprd04.prod.outlook.com (2603:1096:202:15::30) To SN1PR12MB2558.namprd12.prod.outlook.com (2603:10b6:802:2b::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by HK2PR04CA0086.apcprd04.prod.outlook.com (2603:1096:202:15::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Wed, 2 Sep 2020 03:43:44 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [58.247.170.242] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7d8b9b55-6b7b-47ca-79cf-08d84ef26508 X-MS-TrafficTypeDiagnostic: SN6PR12MB2623: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hc4UuDU+ig8Xa9DOfcdJT9ljyfbjVjHDQGs/2HGMG1ZHPgcU0mDDnL3mr1W+BlK6ubFRfPF0q1CEgS1qY8S5GC2bAbC50hQrrm6/kOZCAJqhurDxS+8+akXUotC90RDVvNbmY0yG3GydENRcOOwQ7Ikzr+IvPmk6n50/g87OVpo04pCll/muD8P/t+uzBBlXdcSGbEe5n93PdoDGRpjnLyJ3IK+lL5IbQaeNaSaannBpbb0yuoeU4wA8ToCyQnxNndnKibzV6eieEd87ZoeKsKPNSI0yk9YVw9waXM9PvjpC36Alk3GYWkFAKcWmhcm+qzPsrUkhIrjuvuq7BA5m6g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN1PR12MB2558.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(136003)(39860400002)(376002)(346002)(2616005)(66946007)(36756003)(26005)(6666004)(66476007)(6916009)(4326008)(83380400001)(66556008)(956004)(8676002)(1076003)(186003)(52116002)(5660300002)(6486002)(16576012)(2906002)(478600001)(316002)(8936002)(86362001)(45080400002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hSwxPl2SfdZcj0eBlbsF6lPpkqZHM/3vZXvE2D0C6TSGimouxFmS8la5UXQv0KRWD16KbAGQngAPwn+aohXcLPkLehwucCK4HYn3plxoi5Plyh03tI2z/zrF4Q/1nQrssOicmSgdcy9hgWTViN8rc3cOSYMYMG4ApWm3KXC7M8gi8kDtBIgHmrPCvA8xuzeRAJ0dcsjwSY2avLEJAHSHjmW1X6DdUuWtacCQaBpr25tBryj7moyGb/VaaL0qW5zX4DxwWhtPxaZFXs+WbDRJmmDHmPVld/0HsqNqT+TERfYsZZhfMFBpTgN9JPPZHMifVFvtT/eZAOW+de8I8BgB5B+NLqrjBWWhd00SXo4xhNmvLoemWrHX4P6qwUPi6ozV8g2RAjC32iuS2GAgO5R2hmEVJBCGPrydY7CMBkuCsvHlBl49ZtfWuQiYZJq8X8WehIS8qDuS8qxTHe7b+EZljS3trz3n2SnRjHv7T5jUovh8XfzrCFe4A58lfCr2aOXalRzyHbll9qjoM/ctA8WxeFnDK2nYlezacKoPrdqkRo4YQ5lf3JNgyxa8Pvg/UQOGisxx9wta8EpH9n4VXuTYHa05ynTHqT3RtaCkbLzmRBym/ktlWviQxTEVMGcJInUkHByViLNpGBEA7HE4fU0+VQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d8b9b55-6b7b-47ca-79cf-08d84ef26508 X-MS-Exchange-CrossTenant-AuthSource: SN1PR12MB2558.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2020 03:43:45.8640 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zqZazJsYHzNez840iN2C/Cu2A/TZRo0MyyUvYPvt19HZw+YYZbGIL92XusK8YcIZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2623 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xinhui pan , christian.koenig@amd.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" This reverts commit 1e691e2444871d1fde11b611653b5da9010dcec8. mem->mm_node now could be NULL with commit above. That makes amdgpu_vm_bo_split_mapping touchs outside of the page table as max_entries set to S64_MAX; before we fix that issue, revert commit above. [ 978.955925] BUG: unable to handle page fault for address: ffff94dfc4bc0000 [ 978.963424] #PF: supervisor read access in kernel mode [ 978.969034] #PF: error_code(0x0000) - not-present page [ 978.974662] PGD 72e201067 P4D 72e201067 PUD 86a414067 PMD 86a3ee067 PTE 800ffff83b43f060 [ 978.983494] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC NOPTI [ 978.988992] CPU: 0 PID: 12264 Comm: Xorg Tainted: G W O 5.9.0-rc2+ #46 [ 978.997394] Hardware name: System manufacturer System Product Name/PRIME Z390-A, BIOS 1401 11/26/2019 [ 979.007495] RIP: 0010:amdgpu_vm_bo_update+0x5af/0x880 [amdgpu] [ 979.013881] Code: ff ff ff ff ff 7f 48 8b 45 c0 4c 8d 04 d8 b8 01 00 00 00 eb 09 48 83 c0 01 48 39 c2 76 12 49 8b 74 c0 f8 48 81 c6 00 10 00 00 <49> 39 34 c0 74 e5 8b 75 b4 4c 8b 45 c8 48 38 [ 979.034354] RSP: 0018:ffffa94281403ba8 EFLAGS: 00010206 [ 979.040050] RAX: 0000000000000200 RBX: 0000000000000e00 RCX: 00000000001049e8 [ 979.047824] RDX: 7fffffffffffffff RSI: 00000007c5e00000 RDI: ffff94dfd5fc0000 [ 979.055644] RBP: ffffa94281403c40 R08: ffff94dfc4bbf000 R09: 0000000000000001 [ 979.063441] R10: 0000000000000000 R11: 0000000000000000 R12: 00000000001047e8 [ 979.071279] R13: 0000000000000000 R14: 00000000001047e9 R15: ffff94dfc4e9af48 [ 979.079098] FS: 00007f19d3d00a80(0000) GS:ffff94e007e00000(0000) knlGS:0000000000000000 [ 979.087911] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 979.094240] CR2: ffff94dfc4bc0000 CR3: 00000007c408c005 CR4: 00000000003706f0 [ 979.102050] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 979.109868] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 979.117669] Call Trace: [ 979.120393] amdgpu_gem_va_ioctl+0x533/0x560 [amdgpu] [ 979.125970] ? amdgpu_gem_va_map_flags+0x70/0x70 [amdgpu] [ 979.131914] drm_ioctl_kernel+0xb4/0x100 [drm] [ 979.136792] drm_ioctl+0x241/0x400 [drm] [ 979.141100] ? amdgpu_gem_va_map_flags+0x70/0x70 [amdgpu] [ 979.147003] ? _raw_spin_unlock_irqrestore+0x4c/0x60 [ 979.152446] ? trace_hardirqs_on+0x2b/0xf0 [ 979.156977] amdgpu_drm_ioctl+0x4e/0x80 [amdgpu] [ 979.162033] __x64_sys_ioctl+0x91/0xc0 [ 979.166117] do_syscall_64+0x38/0x90 [ 979.170022] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 979.175537] RIP: 0033:0x7f19d405e37b [ 979.179450] Code: 0f 1e fa 48 8b 05 15 3b 0d 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d e5 3a 08 [ 979.200034] RSP: 002b:00007ffe66c9e938 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 979.208330] RAX: ffffffffffffffda RBX: 00007ffe66c9e990 RCX: 00007f19d405e37b [ 979.216147] RDX: 00007ffe66c9e990 RSI: 00000000c0286448 RDI: 0000000000000010 [ 979.223897] RBP: 00000000c0286448 R08: 00000001039e9000 R09: 000000000000000e [ 979.231742] R10: 00005640dcedf010 R11: 0000000000000246 R12: 0000000000000000 [ 979.239555] R13: 0000000000000010 R14: 0000000000000001 R15: 00007ffe66c9ea58 [ 979.247358] Modules linked in: amdgpu(O) iommu_v2 gpu_sched(O) ttm(O) drm_kms_helper(O) cec i2c_algo_bit fb_sys_fops syscopyarea sysfillrect sysimgblt overlay binfmt_misc snd_sof_pci snd_sos [ 979.247375] x_tables autofs4 crc32_pclmul e1000e i2c_i801 i2c_smbus ahci libahci wmi video pinctrl_cannonlake pinctrl_intel [ 979.354934] CR2: ffff94dfc4bc0000 [ 979.358566] ---[ end trace 5b622843e4242519 ]--- Signed-off-by: xinhui pan --- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 104 ++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 +--- 2 files changed, 80 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c index e1b66898cb76..295d6fbcda8f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c @@ -150,7 +150,60 @@ static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man) */ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem) { - return mem->mm_node != NULL; + struct amdgpu_gtt_node *node = mem->mm_node; + + return (node->node.start != AMDGPU_BO_INVALID_OFFSET); +} + +/** + * amdgpu_gtt_mgr_alloc - allocate new ranges + * + * @man: TTM memory type manager + * @tbo: TTM BO we need this range for + * @place: placement flags and restrictions + * @mem: the resulting mem object + * + * Allocate the address space for a node. + */ +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, + struct ttm_buffer_object *tbo, + const struct ttm_place *place, + struct ttm_mem_reg *mem) +{ + struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); + struct amdgpu_gtt_mgr *mgr = man->priv; + struct amdgpu_gtt_node *node = mem->mm_node; + enum drm_mm_insert_mode mode; + unsigned long fpfn, lpfn; + int r; + + if (amdgpu_gtt_mgr_has_gart_addr(mem)) + return 0; + + if (place) + fpfn = place->fpfn; + else + fpfn = 0; + + if (place && place->lpfn) + lpfn = place->lpfn; + else + lpfn = adev->gart.num_cpu_pages; + + mode = DRM_MM_INSERT_BEST; + if (place && place->flags & TTM_PL_FLAG_TOPDOWN) + mode = DRM_MM_INSERT_HIGH; + + spin_lock(&mgr->lock); + r = drm_mm_insert_node_in_range(&mgr->mm, &node->node, mem->num_pages, + mem->page_alignment, 0, fpfn, lpfn, + mode); + spin_unlock(&mgr->lock); + + if (!r) + mem->start = node->node.start; + + return r; } /** @@ -181,37 +234,29 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man, atomic64_sub(mem->num_pages, &mgr->available); spin_unlock(&mgr->lock); - if (!place->lpfn) { - mem->mm_node = NULL; - mem->start = AMDGPU_BO_INVALID_OFFSET; - return 0; - } - node = kzalloc(sizeof(*node), GFP_KERNEL); if (!node) { r = -ENOMEM; goto err_out; } + node->node.start = AMDGPU_BO_INVALID_OFFSET; + node->node.size = mem->num_pages; node->tbo = tbo; - - spin_lock(&mgr->lock); - r = drm_mm_insert_node_in_range(&mgr->mm, &node->node, mem->num_pages, - mem->page_alignment, 0, place->fpfn, - place->lpfn, DRM_MM_INSERT_BEST); - spin_unlock(&mgr->lock); - - if (unlikely(r)) - goto err_free; - mem->mm_node = node; - mem->start = node->node.start; - return 0; - -err_free: - kfree(node); + if (place->fpfn || place->lpfn || place->flags & TTM_PL_FLAG_TOPDOWN) { + r = amdgpu_gtt_mgr_alloc(man, tbo, place, mem); + if (unlikely(r)) { + kfree(node); + mem->mm_node = NULL; + goto err_out; + } + } else { + mem->start = node->node.start; + } + return 0; err_out: atomic64_add(mem->num_pages, &mgr->available); @@ -232,14 +277,17 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man, struct amdgpu_gtt_mgr *mgr = man->priv; struct amdgpu_gtt_node *node = mem->mm_node; - if (node) { - spin_lock(&mgr->lock); - drm_mm_remove_node(&node->node); - spin_unlock(&mgr->lock); - kfree(node); - } + if (!node) + return; + spin_lock(&mgr->lock); + if (node->node.start != AMDGPU_BO_INVALID_OFFSET) + drm_mm_remove_node(&node->node); + spin_unlock(&mgr->lock); atomic64_add(mem->num_pages, &mgr->available); + + kfree(node); + mem->mm_node = NULL; } /** diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 63e541409549..cecda9d0d067 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -430,22 +430,12 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, } src_offset = src->offset; - if (src->mem->mm_node) { - src_mm = amdgpu_find_mm_node(src->mem, &src_offset); - src_node_size = (src_mm->size << PAGE_SHIFT) - src_offset; - } else { - src_mm = NULL; - src_node_size = ULLONG_MAX; - } + src_mm = amdgpu_find_mm_node(src->mem, &src_offset); + src_node_size = (src_mm->size << PAGE_SHIFT) - src_offset; dst_offset = dst->offset; - if (dst->mem->mm_node) { - dst_mm = amdgpu_find_mm_node(dst->mem, &dst_offset); - dst_node_size = (dst_mm->size << PAGE_SHIFT) - dst_offset; - } else { - dst_mm = NULL; - dst_node_size = ULLONG_MAX; - } + dst_mm = amdgpu_find_mm_node(dst->mem, &dst_offset); + dst_node_size = (dst_mm->size << PAGE_SHIFT) - dst_offset; mutex_lock(&adev->mman.gtt_window_lock); -- 2.25.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx