From patchwork Wed Nov 6 17:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 11230793 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF3F21709 for ; Wed, 6 Nov 2019 17:51:27 +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 D6835214D8 for ; Wed, 6 Nov 2019 17:51:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6835214D8 Authentication-Results: mail.kernel.org; dmarc=none (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 F0E466EE23; Wed, 6 Nov 2019 17:51:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::61e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 603BE6EE1D; Wed, 6 Nov 2019 17:51:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=afKWtsz6/1rGbw4R5TraapYyeJ6uN5GGS1n06cXatcNJerVX9+6JVXYZ7S7sPEJENHRaRj0j5uDTmcTCW7rC4f61TbZufmpV9Ei41QSSWXRnwdtWupxs/UEDA7j5rn9z8fmM2k28VMmFiDcEcnFMWCn+W6TaT533EoTveMtE1DnD3kONEvMilAuywV//8CsDg14ygQlIlENFrCRNH7iIP9ckdD9RzfXp7I83M8GkYlnChLgJ23NMro5QOfpRAXkZfHrVnxU4iwJlQZnWfHanbYjy5eJ1Ug/2y5p4SdsKsu2nsuPmPnMWy/zk//Dn7g8j+rlIyVGBTYu+6VUZMqNqcw== 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=6fRaMFMMXIG5vfsrhB70NWUa/7t/tshIzlvO8b15v/Q=; b=Z9mVLmHEvI/WxEUa6ZzqyRvof43iNb3xeqS7k8Crgc6ecFx6HkImrx00/+M+iwz1o0tXS/PlrvXZmATT3G/aW4MvPOefWXkTgwQk3D/lHJEjmbyt7UBX1Rf+15igyr3sBTKYzEyusGfMMiml/Ylt5U/sginPIKLeXWPWqVKJPo4RM/xBggsXrsDZfbRikNntrjj9pYdItsdy/gUjh5iJyPGw9GarwPp9EolpfziNy5G+N/g/tlWaYmXSCPG0bZFZZCQ1NIbVnGSve947+hb8kqVpWrQYJKAcT++NDNBgEpIX7vrglQpfFD5VbK/yK2t0bf6/gkDrpJ2QuPR909NRKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from CY4PR1201CA0012.namprd12.prod.outlook.com (2603:10b6:910:16::22) by DM6PR12MB2683.namprd12.prod.outlook.com (2603:10b6:5:52::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Wed, 6 Nov 2019 17:51:21 +0000 Received: from CO1NAM03FT011.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::206) by CY4PR1201CA0012.outlook.office365.com (2603:10b6:910:16::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2430.22 via Frontend Transport; Wed, 6 Nov 2019 17:51:21 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB01.amd.com (165.204.84.17) by CO1NAM03FT011.mail.protection.outlook.com (10.152.80.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2430.20 via Frontend Transport; Wed, 6 Nov 2019 17:51:20 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 6 Nov 2019 11:51:19 -0600 Received: from SATLEXMB01.amd.com (10.181.40.142) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 6 Nov 2019 11:51:19 -0600 Received: from agrodzovsky-All-Series.amd.com (10.180.168.240) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Wed, 6 Nov 2019 11:51:19 -0600 From: Andrey Grodzovsky To: Subject: [PATCH 3/4] drm/sched: Avoid job cleanup if sched thread is parked. Date: Wed, 6 Nov 2019 12:51:11 -0500 Message-ID: <1573062672-23698-3-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1573062672-23698-1-git-send-email-andrey.grodzovsky@amd.com> References: <1573062672-23698-1-git-send-email-andrey.grodzovsky@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(376002)(346002)(39860400002)(396003)(428003)(199004)(189003)(426003)(86362001)(336012)(446003)(70586007)(11346002)(70206006)(50466002)(4326008)(2616005)(476003)(126002)(316002)(16586007)(5660300002)(109986005)(26005)(51416003)(7696005)(186003)(53416004)(76176011)(48376002)(54906003)(44832011)(486006)(8936002)(1671002)(81166006)(478600001)(81156014)(2906002)(8676002)(50226002)(47776003)(36756003)(6666004)(356004)(450100002)(305945005)(266003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB2683; H:SATLEXMB01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1a147cb-f4d0-421b-d931-08d762e1eea8 X-MS-TrafficTypeDiagnostic: DM6PR12MB2683: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:792; X-Forefront-PRVS: 02135EB356 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XpMDDfE/cle5BqZ+3yF4QbRrjzBxDqO8IT+dwLnnjS7ra6GN4LMTVKpDlWbE+uG+SY4g0oWpSixDJiEn5dvdzjLW9NAR5bwr1NxTmeA754AvqBY0vFA+Bs03+S6lZBcU7KZYYpZXpjUUubAb/UmcIRjYlriKqAQxG7+FGpH5M5WW5ZbkWD6bB8+gieQ66EklInb49tqesXr63ob6PvAuW2R20HxSRHVZ8uHMrBXT3TOM3upAS1+Bufy/hr8JhfwtcRvcxROErOUKMg6HvCE17WrenjE5bT6LhPRlTSZ6l2F1fgVypSiR48evZU0Rp4qeJ43oXAh9Eukrh3Rag/aVFPGROfuhI47HHmpbOuVwX+FOHlcujGzUvjzr83prBfGH1+m+koO0jZymAGMIO1Z5e7LO3q7sgi0heTlXQdmnPnjYMT0sMneK6PKQ4PEwwLsJ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2019 17:51:20.5669 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1a147cb-f4d0-421b-d931-08d762e1eea8 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=[SATLEXMB01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2683 X-Mailman-Original-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=6fRaMFMMXIG5vfsrhB70NWUa/7t/tshIzlvO8b15v/Q=; b=x8stlZFMFmz5ZZc9xBaFB2fkiLvGXrbQ95sqpxnhmhG7zUHwMjqHg4RqXzqiSo/GF5yTtg3p+jG5ZHP8lVahaqtPr6s7i7DoePUTex2mB0EKnl6aHwoSJ+cmKIGKW5EW2QqWWmZgYL0PvUAIhmDzhK5MaOEodYYISTaaKsr/aqE= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; 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: Shirish.S@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Christian.Koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When the sched thread is parked we assume ring_mirror_list is not accessed from here. Signed-off-by: Andrey Grodzovsky --- drivers/gpu/drm/scheduler/sched_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 38bbad7..80ddbdf 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -647,9 +647,13 @@ static void drm_sched_cleanup_jobs(struct drm_gpu_scheduler *sched) { unsigned long flags; - /* Don't destroy jobs while the timeout worker is running */ - if (sched->timeout != MAX_SCHEDULE_TIMEOUT && - !cancel_delayed_work(&sched->work_tdr)) + /* + * Don't destroy jobs while the timeout worker is running OR thread + * is being parked and hence assumed to not touch ring_mirror_list + */ + if ((sched->timeout != MAX_SCHEDULE_TIMEOUT && + !cancel_delayed_work(&sched->work_tdr)) || + __kthread_should_park(sched->thread)) return;