From patchwork Thu Nov 15 14:46:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10684491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F119313B5 for ; Thu, 15 Nov 2018 14:46:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E276A2874B for ; Thu, 15 Nov 2018 14:46:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBE342C91C; Thu, 15 Nov 2018 14:46:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E893B2C915 for ; Thu, 15 Nov 2018 14:46:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43E6A6E02C; Thu, 15 Nov 2018 14:46:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 3941 seconds by postgrey-1.36 at gabe; Thu, 15 Nov 2018 14:46:15 UTC Received: from theia.8bytes.org (8bytes.org [IPv6:2a01:238:4383:600:38bc:a715:4b6d:a889]) by gabe.freedesktop.org (Postfix) with ESMTPS id 132B66E02C; Thu, 15 Nov 2018 14:46:15 +0000 (UTC) Received: by theia.8bytes.org (Postfix, from userid 1000) id 63A054A7; Thu, 15 Nov 2018 15:46:13 +0100 (CET) From: Joerg Roedel To: Rex Zhu , Evan Quan , Alex Deucher , christian.koenig@amd.com, David1.Zhou@amd.com Subject: [PATCH] drm/amdgpu: Fix Kernel Oops triggered by kfdtest Date: Thu, 15 Nov 2018 15:46:12 +0100 Message-Id: <20181115144612.30301-1-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joerg Roedel , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel Running kfdtest on Kaveri triggers a kernel NULL-ptr dereference: BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 42c017067 P4D 42c017067 PUD 40f071067 PMD 0 Oops: 0010 [#1] SMP NOPTI CPU: 0 PID: 13107 Comm: kfdtest Not tainted 4.20.0-rc2+ #11 Hardware name: Gigabyte Technology Co., Ltd. To be filled by O.E.M./F2A88XM-HD3, BIOS F6 05/28/2014 RIP: 0010: (null) Code: Bad RIP value. RSP: 0018:ffffc90001adbbf0 EFLAGS: 00010202 RAX: ffffffffa0806240 RBX: ffff88842a0fbc00 RCX: 0000000000000002 RDX: 0000000000000001 RSI: 0000000000000004 RDI: ffff888429690000 RBP: ffffc90001adbbf8 R08: 0000000000002000 R09: ffff88842e542ec0 R10: 00007feff778f008 R11: 00007feff778f010 R12: 0000000000000000 R13: ffff88840f063a20 R14: ffff88842a0fbd20 R15: 000000000f43ff60 FS: 00007feff7769740(0000) GS:ffff88842fa00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 000000040f122000 CR4: 00000000000406f0 Call Trace: ? amdgpu_amdkfd_set_compute_idle+0x29/0x30 [amdgpu] register_process+0x140/0x150 [amdgpu] pqm_create_queue+0x395/0x560 [amdgpu] kfd_ioctl_create_queue+0x285/0x680 [amdgpu] kfd_ioctl+0x27f/0x450 [amdgpu] ? kfd_ioctl_destroy_queue+0x80/0x80 [amdgpu] do_vfs_ioctl+0x96/0x6a0 ? __audit_syscall_entry+0xdd/0x130 ? handle_mm_fault+0x11b/0x240 ksys_ioctl+0x67/0x90 __x64_sys_ioctl+0x1a/0x20 do_syscall_64+0x61/0x190 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The reason is that the pp_funcs->switch_power_profile function pointer is not set for a Kaveri ASIC and thus the kernel calls a NULL pointer. Add a check before calling the function to avoid that. Signed-off-by: Joerg Roedel Signed-off-by: Joerg Roedel --- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h index f972cd156795..0ecedd30f2aa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h @@ -337,8 +337,9 @@ enum amdgpu_pcie_gen { (adev)->powerplay.pp_handle, request)) #define amdgpu_dpm_switch_power_profile(adev, type, en) \ - ((adev)->powerplay.pp_funcs->switch_power_profile(\ - (adev)->powerplay.pp_handle, type, en)) + if ((adev)->powerplay.pp_funcs->switch_power_profile != NULL) \ + ((adev)->powerplay.pp_funcs->switch_power_profile(\ + (adev)->powerplay.pp_handle, type, en)) #define amdgpu_dpm_set_clockgating_by_smu(adev, msg_id) \ ((adev)->powerplay.pp_funcs->set_clockgating_by_smu(\