From patchwork Fri Feb 12 06:40:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Kuehling X-Patchwork-Id: 12084769 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,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 3E2E2C433E0 for ; Fri, 12 Feb 2021 06:41:05 +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 F3C8464E42 for ; Fri, 12 Feb 2021 06:41:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3C8464E42 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B74806E51A; Fri, 12 Feb 2021 06:40:57 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760059.outbound.protection.outlook.com [40.107.76.59]) by gabe.freedesktop.org (Postfix) with ESMTPS id D09A46E14C; Fri, 12 Feb 2021 06:40:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UB3NTxWul4OqNee4zQlApljyjwhtbw78Vl86iwcKkDAu8F7+i/GvVW53fq4Fy0zUiDMayU6mIEjg767sFEA0DrXp2Ry8UxehzqBxejAxEsuySrO70ailNj95ZSyxf7Dcma1HgthHvp2Hua08S7dvqTgkXCb9twmL3o2VZL8b7xKOz52lsv/evPu7181Bd6bilqPHA3A4OnvTVLCbb//wkCmDztJUb0QR0+2gk/XhofgDK8+FcbMvVLd7A5DSKcj+Lbbar2lkWg3OXeGnSaWpZP7K284rfswEILgONWPMXGAb0m3ZdZ4hnfWVLxZJZeLcUGODLFkc30mQ9uP9dmxnfw== 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=0gZjfHTl7L5J01awQtY4ft8Z4BZkKfcgO4EC6GXmX3I=; b=aAsK4RwmouaIdgRhSeyvQFsUkVuTgGimt8kb//TDdDTLMrvxdYo5YCkmtMbLDlY/3ux98RzWza7Xn+z3tzak4ztA6Lce9D7hy8StATSPNRpzHW6Mztd2UXfwxrDM1XszVmP9jVu9ATldsnkJn0AuB/VRNUb/3h9/jruABTTaG8klsdcNnn7fddiwJLiZPqShOVbXg1gMO9fVp9twenGcsJjVhuTkwcig7SmEfisiq5itOKQrBKOXRC8HNXRg+7IG5DqUlneZIuLhQZ/uinGZv6VkgQRcEGadI3eO5OEQiZQalQ0COhqhXcO8aLF+13Ovlnz4A00yhhM0+TtqRg6qyQ== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0gZjfHTl7L5J01awQtY4ft8Z4BZkKfcgO4EC6GXmX3I=; b=S0HZhVJzdI4W2XHuAyKFU9mhVyQM/hMC9v3gH/CJNYcTcmK/fy+SqnXPj6Yf/sRqmqo5qk47cXwHip4hB0R5UPe6SXtxUUK+94BkHTfg3UFpXsTGpOQZdo8vh+GxIm3KY8cjoUxjGKg2A87cYqMErgr40O0WLzIvKl41lPN3qCM= 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 BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) by BL0PR12MB4961.namprd12.prod.outlook.com (2603:10b6:208:1c9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Fri, 12 Feb 2021 06:40:52 +0000 Received: from BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::ec8d:851e:525d:a6ab]) by BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::ec8d:851e:525d:a6ab%8]) with mapi id 15.20.3784.028; Fri, 12 Feb 2021 06:40:52 +0000 From: Felix Kuehling To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 1/2] drm/amdkfd: Use mmu_notifier_get Date: Fri, 12 Feb 2021 01:40:33 -0500 Message-Id: <20210212064034.29912-1-Felix.Kuehling@amd.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.55.211] X-ClientProxiedBy: YT1PR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::21) To BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (165.204.55.211) by YT1PR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.19 via Frontend Transport; Fri, 12 Feb 2021 06:40:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cb731986-1117-4b50-0583-08d8cf212462 X-MS-TrafficTypeDiagnostic: BL0PR12MB4961: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ZO3jhLwnT1G66opjZCd6Tg5FwxLUp2Xnw6rQr4Lu4X0OVRG7QSVCPklSRpbhm9qcnbdwKZWpc05ygLUIPIk82hYfgL2EnGjDMDZWo1AM3fnK060bFAUH3PpIubPhkbfj73fq+6GAybWn1/SNvUK9aMbHQUMzp5Er30vmIPlCMdJZIye9F8fh2M5KxY+e8o1dCmHETy6VTdCcQ2VZSQCNQwsS8JItvix1fKuXtIlE8si7gD3ezwdzasI5pOPNieyvgOFHmbVrCRMT3xd2yW/vRTfhWn4lXzj1rfz3CbPvfabuw6p0kgoWl70JEN7JXiobXycrNi5Q/CIyFfuuQ4b23m/s7qnrrgjbw6xMmBWZ17zzuYVNFQYBRRhjQVOnMhLfL6XKragQT7x6/3Glp7nkni+vcyvnTayMHAbHKmn1tYz7QRZ/24vRRM5ii5Md764m/6jzT70Iip7HSVrlK9cf3S9RafF9DgVnAN7spAKnDVUQ+nA6g1tTXehcXRmZIokW9zWNgsp6XK8Ux/zCG0Iip3GzvpmmOkICMZCLBNWCvKvTH5/9RjFbtq4aNwpzykyszew3/wfy91iLHbE3hkfzg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR12MB4948.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(376002)(39860400002)(396003)(346002)(6512007)(8676002)(1076003)(2906002)(26005)(186003)(316002)(16526019)(450100002)(8936002)(2616005)(6486002)(6666004)(956004)(5660300002)(6506007)(66946007)(52116002)(66476007)(66556008)(86362001)(69590400011)(36756003)(83380400001)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WIQ48MDbWj/iwKQ3piFj6fi/ipn3evgFpWJOTzIahewzd/HUB7PbgZtKLDInfzKLKhLQy8f+JMmOZEbg8eHBzhJ6T/pCLdpAxM8wUNkljSOExL9MBqLIUCSsHSaly6+zI7JpSPP0UDN9Zjfch0bDh94qhlCA0nGE52XpS1lxYkuaumYFU3nbFFdWXWcIu90hPNIi68GqvEaJY7ZNeE+S3pEu/MwXfqA7fQo5pN8ufM23bjbPzKEHD8JqX6G3uQjcDzv+lGxR/xaq+GlLdISXZTriuXDhg1kzB5NTfrC5yUh6hLlboSaW602L0U0lBWyesU20yvqj+KmBqIhvvzxEdiOUJat9/vakoAygPCznIZYnzYILz25bNiPza7dER00XZcr7Koc3L7g45rmSjRBXWQsoFzrG9/0ckfPME/sgN6PaZyA59CbqWg12Uuve63QPPYrYrNSC0TBrCfcwSq6CoLl4pDtxVE2i/oF7hEiIU3l5nH7vkEtq3IBB+3QAChMQMp+3pnzQHjZ3dtoXb50ew+lynngy60AHHlQ7+P8c3PdSr7BnL27Ry6Dw1YuWyL0dt+O26vpqZhM+/T1T8lP8p6y0b4DhG/iDfa0UrIcKeAE5fJla4wH3fByVJAhbKmdYLrTLKGgwTGEM9D6OrQ39vySnID+eVuwzbSgxnlf3uPjaLgkL/1QxCDYPlg871XccRZQhF8byYi81NDn6Qhy0oh9LveMe4vJOLj0JM3VW0EKdLnPlpmJzTLI78ePHoq0NDGlwmb6wQM+9AqAsL9Zdh5/kBqD7qXkXqHD5Q68CHWLuSch0N72cvOX6OfjskqC2nR+l+SUbXZPe5v8jveet3u2vpolBn+H2vyXJD0v10/hoLCCwhnIUcmsh/lEuEXZeY4NMbQolTe9OvjGUeBkZlO2wnvALo6DmNqr8APFazKABrznjB1wBD8E2oh5O+2KrtJHcO36eykrkdT9uI/Wx7bUnT0xt8+IUYrUPL7FgIyWDvmw7lNHjg9ziBCXvFUb6jK9QkraXwDtKj/cMGQirx5Uv2CIOv2ZnR9r86HW7UZI9ZBulyzth6pWOZi22Aqr68VMMXqcT4cuIhnF8l2LsdFpWJ16yye6Jr5S9Jdp9cO+O9/GA5XBAuTMiJvm8l1/261cNrEnykqGVacNWO07PUWN6zh46txIm78S93qAzn4ozSNTGmd0jUKketdZycvUPiXUPA0+2fY9V3/9KNBm2jn7lSyqufsr4BCzS8IT3mxlTWX/DeqC6xAAEMmGzfpCpa0MEP4hLnEtE70jd0VjXtcDfYAOuePLJdPMC6OU251XlzMPyyKZk21raxXd15xWo X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb731986-1117-4b50-0583-08d8cf212462 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB4948.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2021 06:40:52.6529 (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: XHYxHf6E2wNTpzsvgSJe/aqbRUaJbXWYOoJ4NfkUY2pxbyCAUjVQqWDCEvjfMNeqcnNtwzySMhUfAiq3JrbOwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4961 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" We use mmu_notifier_put to free the MMU notifier. That needs to be paired with mmu_notifier_get to work correctly. Othewrise the next patch would cause a kernel oops. Signed-off-by: Felix Kuehling --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 33 +++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 2807e1c4d59b..145cd0a17d50 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -1011,6 +1011,16 @@ static void kfd_process_ref_release(struct kref *ref) queue_work(kfd_process_wq, &p->release_work); } +static struct mmu_notifier *kfd_process_alloc_notifier(struct mm_struct *mm) +{ + int idx = srcu_read_lock(&kfd_processes_srcu); + struct kfd_process *p = find_process_by_mm(mm); + + srcu_read_unlock(&kfd_processes_srcu, idx); + + return p ? &p->mmu_notifier : ERR_PTR(-ESRCH); +} + static void kfd_process_free_notifier(struct mmu_notifier *mn) { kfd_unref_process(container_of(mn, struct kfd_process, mmu_notifier)); @@ -1075,6 +1085,7 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn, static const struct mmu_notifier_ops kfd_process_mmu_notifier_ops = { .release = kfd_process_notifier_release, + .alloc_notifier = kfd_process_alloc_notifier, .free_notifier = kfd_process_free_notifier, }; @@ -1152,6 +1163,7 @@ static int kfd_process_device_init_cwsr_dgpu(struct kfd_process_device *pdd) static struct kfd_process *create_process(const struct task_struct *thread) { struct kfd_process *process; + struct mmu_notifier *mn; int err = -ENOMEM; process = kzalloc(sizeof(*process), GFP_KERNEL); @@ -1182,19 +1194,28 @@ static struct kfd_process *create_process(const struct task_struct *thread) if (err != 0) goto err_init_apertures; - /* Must be last, have to use release destruction after this */ - process->mmu_notifier.ops = &kfd_process_mmu_notifier_ops; - err = mmu_notifier_register(&process->mmu_notifier, process->mm); - if (err) + /* alloc_notifier needs to find the process in the hash table */ + hash_add_rcu(kfd_processes_table, &process->kfd_processes, + (uintptr_t)process->mm); + + /* MMU notifier registration must be the last call that can fail + * because after this point we cannot unwind the process creation. + * After this point, mmu_notifier_put will trigger the cleanup by + * dropping the last process reference in the free_notifier. + */ + mn = mmu_notifier_get(&kfd_process_mmu_notifier_ops, process->mm); + if (IS_ERR(mn)) { + err = PTR_ERR(mn); goto err_register_notifier; + } + BUG_ON(mn != &process->mmu_notifier); get_task_struct(process->lead_thread); - hash_add_rcu(kfd_processes_table, &process->kfd_processes, - (uintptr_t)process->mm); return process; err_register_notifier: + hash_del_rcu(&process->kfd_processes); kfd_process_free_outstanding_kfd_bos(process); kfd_process_destroy_pdds(process); err_init_apertures: From patchwork Fri Feb 12 06:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Kuehling X-Patchwork-Id: 12084767 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 C3648C433E0 for ; Fri, 12 Feb 2021 06:41:00 +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 8295F64E42 for ; Fri, 12 Feb 2021 06:41:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8295F64E42 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 710B16E14C; Fri, 12 Feb 2021 06:40:57 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760059.outbound.protection.outlook.com [40.107.76.59]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA73889E63; Fri, 12 Feb 2021 06:40:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IsgiqMmqadRaDoHp5DMb0Ohxhbztqb6qYWrZaMtII7uV4EDj2plvPQ3klgMf1Zh+3QgusBK/mt/jn76g73yb3bc5C/OFct4ZxW+d5aMNHLcOyBZ1WJMCpuyArWwhWYfxrbhIVz5JeqCvXkKMr7SFk4/voehFMdr2k+2MGSpHXEut67uiVh56S/1BL2I1OpB5cBoLjEZkWpQzlM7pWIZ1fFXrp25xaUn5WC75+5MPyf5gLa9dHkAPXxjvday6r6VTXIVgbxBvvOJeGa4f2Tq/pgUjCjdtkhVMrPuGYaqC8Bd1jh9xHWstaZ3IQFpMW4l3a21GFhkq+guV/RuXVUEb7A== 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=SXJZnGfATmdA7350kv8gpaN2gzBNlvMrIzbw5mWsA6I=; b=UB5UJ9M1Y7XTuRC5i8YOGNQwMBXxiFm+f8h7/XrYfsVjA1GdTZVtxj9+yzkIhyYQN7V2hoE3BljRTt78o/TkK1hZ0WHnaBcPASVuX5tCcSkNcXJmmQ00V06W8eewFDBN5hRKlwitqyFIvoJXT+NjkJgDT9Xbcp/DDTnf65Z/ym6Mg9Z+iV085Ri6N2w1B0FDbo4RUDJ6GlSjw+YSaEQ21HokiBRFbOGgGyT0kZl9QZgLnzH8Lqi9g0lrXInevOWa5E5fkPnBZF23Ro0k1PF3BbHEXbHSQqfGfLfD+1xVAyhkk6TPPm0BG4NYhooorQdXA+CkQ5G8lDbV4AuWFOHOEw== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SXJZnGfATmdA7350kv8gpaN2gzBNlvMrIzbw5mWsA6I=; b=HJf/C8Pt/jrH+dkx0kz1qHjl1jigvnsXcFTTWFHpDM+B2ojHV1H61aoj6pNuQCOFkP9pa+N5coVQ1fu1EkKX4IZdLFfTc9qoVZu+IGaqoOMrBKwOVilzXt3vE/cIn2JhFpydcrhL+nGipHme3etZg2Vx1uboJLnchfIGSZ5rXos= 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 BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) by BL0PR12MB4961.namprd12.prod.outlook.com (2603:10b6:208:1c9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Fri, 12 Feb 2021 06:40:53 +0000 Received: from BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::ec8d:851e:525d:a6ab]) by BL0PR12MB4948.namprd12.prod.outlook.com ([fe80::ec8d:851e:525d:a6ab%8]) with mapi id 15.20.3784.028; Fri, 12 Feb 2021 06:40:53 +0000 From: Felix Kuehling To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 2/2] drm/amdkfd: Cleanup kfd_process if init_cwsr_apu fails Date: Fri, 12 Feb 2021 01:40:34 -0500 Message-Id: <20210212064034.29912-2-Felix.Kuehling@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210212064034.29912-1-Felix.Kuehling@amd.com> References: <20210212064034.29912-1-Felix.Kuehling@amd.com> X-Originating-IP: [165.204.55.211] X-ClientProxiedBy: YT1PR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::21) To BL0PR12MB4948.namprd12.prod.outlook.com (2603:10b6:208:1cc::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (165.204.55.211) by YT1PR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.19 via Frontend Transport; Fri, 12 Feb 2021 06:40:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: da5a3646-06c1-40cd-f9e2-08d8cf2124e4 X-MS-TrafficTypeDiagnostic: BL0PR12MB4961: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:194; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rEv2ly817hGYMyHAEy/Usv/oeOP5nqCyf8bQ+Zk0Nm+KsiTTT9Jyo33L24YQvhpaxEWSp3hCgazMqWXhQFW4x2SFT7tmGZRe84EyGrMsl8UdiVfJKSYDMT5uUQoS++W6ORgP3iR3tw3aDIwYeW/Ew3bdaNfWSu7WKAWSX3Wltcqd40cbknbrtQAjBzsAA7PdtnDqwAErhCky7ndoVtg2xOAJ0NH+KQwzq9hmJP79VcK1EN+0EtKpX1KWjfElVI6i/Embmqli+jDhpCY7hDmtl8H0k2Vwn+mUKZVAYF7bwiTvT1pjXy8vNpgwYnD3WvhJ7VNutoNCrv9dVU468svP1lvXcYCHCvokR15gu65Ff6wpoSlA6Yg/0bjRwRlU5gEuoUDyYGavq1Un1tDiNI6C+nPA79+F6Ke/NRl+3o1n6mcltFFvsZBp6edf5zg94HjMPJuRvmknqiTUgMwq9+8T9PerxTdHX7j+VTDjbged7LJcitMAXsIST8JX6g9kbfxuHHNQqYUoNJFnWojKigmERf4rDJ/fUOSdUrgL59O+7ePvkm52088ebhiXUP4OA/f1IOYfCVflucsJPc6oleir4g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR12MB4948.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(376002)(39860400002)(396003)(346002)(6512007)(8676002)(1076003)(2906002)(26005)(186003)(316002)(16526019)(450100002)(8936002)(2616005)(6486002)(6666004)(956004)(5660300002)(6506007)(66946007)(52116002)(66476007)(66556008)(86362001)(69590400011)(36756003)(83380400001)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: oc0ICPI+m6K3B56UGqU4l7TsPzuuXLSy6C9oCfVAGHgPnvZT8NEG6TCRTEjewWnn/cgldLs8/zdo2guA2Rx6AHL/PfnF+ToRZawyAWfBOh+42J2kwJoNH1SecXEeXfRK/2Vgz2+Lab8/Q4Swlnbm5VyMaQ7K+m5pLxyblUiY+rFRSR6ec9Wp0JMD/z6Q0v8bGCcFtC/uPcdRyMxtkttyARycglDjdIZGS2PjXeE3TCsnvO/hhJVwJHtxBowpu2CokH2W+2CeoUWRgas9xroOoXxoZkGKgGGaiW52G8MLg17+eVJzbfROUKMZ5VqxS4bzggbJNW+MMjQut3T3rzJTGVhgJm49U5oZapam/+bF9iynPePRBAz8yps+C0A1f7UTm3dPj6193XQL5UEYlfkjBQDX+5yWhjOltHg+RU2O9dfACL05LYN8sA1sKzi3ekg3P5h+e2KkHZbtW3PHfuF48Lptfsb+UZJYZ4CMflE0x16Ak1/j7YpMRNN+lO4fjxugYobi+GIYNVjPFpjPrAIPHlijkXWWFObeeZb2OSrNq+KiEycbRdpDfQ07ssImN1mgrnj2UK9rpyyPhq8s70SU9Gl2DTpusDRR8OQGyu60DTf+i82PXcTAsOT9kQe06zTZW4abevon+E02ndacyf6FaA8sWRGg4a0e9e6NlWMpoQhD2LfOzp69qMm/P8FL/wwfJKrn5zATKCpVjLAeaFXYz9yIm+f4dPACN8H0tyYmcU/e+2NJjKwUrrnA/GtI2A7RUvh+FdBHMC/mDPN4gPninUkOoxICLa8iZoLvXFmNufEOXysYnKQK/POKk3WSavFGHrC9OtySL575HtA+caHPW5ouYzJC6gt7WnsUhfukl0lMjyMSsPwM9AqbIwXrHaXLoGeGre4IObguWIPnUWUUVXvuCMn3iQm5+4KOkYKJas+ruS+1Dz+qovj2EB+dWHC9Z51ZWXu1VgpgY6Q/NFSqq+kza3d5CXifjEAbWLz6D/cru2f2F4fQirJBrdkU4zn374RSqCSw+kzNWjv5fIIHR/gttiWvJXj9cDov/ZLvoeYc1fzVRmHr1L0ir1nTI3glj9Lv2UKb3BokbOTAB/r+dB0T63gVCsFVUvXxEq2YG5lRmx1Mm3vAJ/2aPeAMnECWG/w0r+Akovo7VLsR627k/SwTOYpjzWFMwSTvZ/Bz1F45SevI+nNAgqOy5bG4b6WR6RH7NBZNGTs62DurIJZSIe9FXv33pmOuL5g+KoFOGlk72qnoto3v0eHIMXkN4psJfL52FgdL0TbxPInWMk3jNeVbClR2DZQRa5vtrNGv/SCTvRtMYBa1OPRvfi2tiP9M X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: da5a3646-06c1-40cd-f9e2-08d8cf2124e4 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB4948.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2021 06:40:53.4613 (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: cEZluHSxm9bvHp0ShqbDnWzTMjNTtlPRy8CJv72E2JWteguYXm07w30mk39/XIJf3frqiHn4idxNW8EG6duJ4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4961 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" If init_cwsr_apu fails, we currently leave the kfd_process structure in place anyway. The next kfd_open will then succeed, using the existing kfd_process structure. Fix that by cleaning up the kfd_process after a failure in init_cwsr_apu. Signed-off-by: Felix Kuehling --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 145cd0a17d50..a4d7682289bb 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -775,10 +775,8 @@ struct kfd_process *kfd_create_process(struct file *filep) goto out; ret = kfd_process_init_cwsr_apu(process, filep); - if (ret) { - process = ERR_PTR(ret); - goto out; - } + if (ret) + goto out_destroy; if (!procfs.kobj) goto out; @@ -826,6 +824,14 @@ struct kfd_process *kfd_create_process(struct file *filep) mutex_unlock(&kfd_processes_mutex); return process; + +out_destroy: + hash_del_rcu(&process->kfd_processes); + mutex_unlock(&kfd_processes_mutex); + synchronize_srcu(&kfd_processes_srcu); + /* kfd_process_free_notifier will trigger the cleanup */ + mmu_notifier_put(&process->mmu_notifier); + return ERR_PTR(ret); } struct kfd_process *kfd_get_process(const struct task_struct *thread)