Message ID | 1421919739-11460-3-git-send-email-oded.gabbay@amd.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7480BC058D for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 22 Jan 2015 09:42:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BDE820328 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 22 Jan 2015 09:42:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B81912034B for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 22 Jan 2015 09:42:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F14BA6E7E4; Thu, 22 Jan 2015 01:42:54 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0135.outbound.protection.outlook.com [157.56.110.135]) by gabe.freedesktop.org (Postfix) with ESMTP id 277096E7E1 for <dri-devel@lists.freedesktop.org>; Thu, 22 Jan 2015 01:42:53 -0800 (PST) Received: from BY1PR0201CA0030.namprd02.prod.outlook.com (25.160.191.168) by BY2PR02MB204.namprd02.prod.outlook.com (10.242.232.26) with Microsoft SMTP Server (TLS) id 15.1.59.20; Thu, 22 Jan 2015 09:42:51 +0000 Received: from BY2FFO11FD038.protection.gbl (2a01:111:f400:7c0c::116) by BY1PR0201CA0030.outlook.office365.com (2a01:111:e400:4814::40) with Microsoft SMTP Server (TLS) id 15.1.65.19 via Frontend Transport; Thu, 22 Jan 2015 09:42:51 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BY2FFO11FD038.mail.protection.outlook.com (10.1.14.223) with Microsoft SMTP Server id 15.1.75.11 via Frontend Transport; Thu, 22 Jan 2015 09:42:50 +0000 X-WSS-ID: 0NIKOB9-08-5QD-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2C3AAD1602C for <dri-devel@lists.freedesktop.org>; Thu, 22 Jan 2015 03:42:44 -0600 (CST) Received: from SATLEXDAG03.amd.com (10.181.40.7) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 22 Jan 2015 03:42:52 -0600 Received: from STOREXDAG03.amd.com (10.1.13.12) by satlexdag03.amd.com (10.181.40.7) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 22 Jan 2015 04:42:49 -0500 Received: from AMD (10.20.0.84) by storexdag03.amd.com (10.1.13.12) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 22 Jan 2015 04:42:47 -0500 From: Oded Gabbay <oded.gabbay@amd.com> To: <dri-devel@lists.freedesktop.org> Subject: [PATCH 3/3] drm/amdkfd: Handle case of invalid queue type Date: Thu, 22 Jan 2015 11:42:19 +0200 Message-ID: <1421919739-11460-3-git-send-email-oded.gabbay@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421919739-11460-1-git-send-email-oded.gabbay@amd.com> References: <1421919739-11460-1-git-send-email-oded.gabbay@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.20.0.84] X-EOPAttributedMessage: 0 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=Oded.Gabbay@amd.com; X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(199003)(189002)(2950100001)(50226001)(33646002)(46102003)(77156002)(229853001)(64706001)(47776003)(106466001)(62966003)(68736005)(105586002)(97736003)(77096005)(2351001)(107886001)(450100001)(110136001)(36756003)(101416001)(92566002)(87936001)(19580405001)(19580395003)(48376002)(86362001)(50466002)(76176999)(50986999); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR02MB204; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-DmarcAction-Test: None X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(3005004);SRVR:BY2PR02MB204; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:BY2PR02MB204; X-Forefront-PRVS: 0464DBBBC4 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB204; X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2015 09:42:50.6965 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96; Ip=[165.204.84.222] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR02MB204 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <http://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 85387c8..99e2dbb 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -301,6 +301,11 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm, } dqm->sdma_queue_count--; deallocate_sdma_queue(dqm, q->sdma_id); + } else { + pr_debug("q->properties.type is invalid (%d)\n", + q->properties.type); + retval = -EINVAL; + goto out; } retval = mqd->destroy_mqd(mqd, q->mqd,
This patch handles a case where amdkfd tries to destroy a queue but the queue type is invalid. This case occurs in non-HWS path. Signed-off-by: Oded Gabbay <oded.gabbay@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +++++ 1 file changed, 5 insertions(+)