From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516768922-2-1540241568275709152 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768921; b=TLP5KASuGrATtgwjNqK7IH1QgIiiYw643YymdHDVdLmyxx2 H1GvJPfryL5Yy/phEdFjAinlrCLHm73fbGi5+1vozoZb4+wEbk/BnJnbBVSTGIIc ZfDUYcVVQfbuAb451YurMxpqFwnSSic2FnArI2qFh4kFdT2bNnu+PWd4tA9FgGNR UcG3DjrQlljHXd5zajjEuWHg5dtW+i7jVzHVEAvaRgkh3UhZwVxwKuHD7w62GiLO pWApFxGJcAYn7x11Kpzl8eCspQ0d+7zGDI4tbC5brflraAcX9b+Rs9lvFJwnoKnK NA2HSmg2tB4p4Z2KwQzAcnEwMAEZm1Bgp74WKLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768921; bh=AmuqAf JeMMAQaDWaZZSgBYL3NBFwWmdrFQZM44z7HXY=; b=JseuLz21lMdJ+DdqqPzr8X eMjVWnH/RUSQMWeXse2kJDt0AoWT+hKhm0eKkzY0B6cyNugUdpqpF+ameFJ1ERLo /kX0DEyw0xEu4wyNLDqZy6QO3+n72dBRBK3BuSCJjLQmS0+1i+88KYMLTlYLyTWk xHZ6BwEIQvDoROFP0vV5o8Ji84UaFWPZWmet0J7wXZM2q7cKUC23Uk/gDK10z6Mf Dg1FesFVZpFbWQcQkPspyG1sFuOoopn6NcktxzCP2EL5ZJpj3VSbSO7fSGfACNU/ iWcnizQTJn2/qGABTQdXTn1kNPBL8Qq0M36oAYX9VXRTNXyK4TePXYrfOccAULrw == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ldtj7TWk x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ldtj7TWk x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932194AbeAXEl6 (ORCPT ); Tue, 23 Jan 2018 23:41:58 -0500 Received: from mail-cys01nam02on0121.outbound.protection.outlook.com ([104.47.37.121]:64896 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932693AbeAXEQz (ORCPT ); Tue, 23 Jan 2018 23:16:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Felix Kuehling , shaoyun liu , Oded Gabbay , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 15/55] drm/amdkfd: Fix SDMA oversubsription handling Thread-Topic: [PATCH AUTOSEL for 4.9 15/55] drm/amdkfd: Fix SDMA oversubsription handling Thread-Index: AQHTlMn8zlHAJT7zBEmi9sg/W77eKg== Date: Wed, 24 Jan 2018 04:15:36 +0000 Message-ID: <20180124041521.32223-15-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1080;7:auipzaBwl+nNSNQsM45S015ukr4Rcm0N+SsZxKmRrbsYe7axMf+z+cj0c4jJcKxKzvVdnxpc6BwJ0p2scXAPTtREyJqdZsfPZCaNZs/eMOWA9COaLpWqCm060OXUny7Kj4DeehkBUr02IN9CdfhbDoEb5sSOiXKbtWYHqxaQH0omRLYZ4n/AX0zAVylFINDh1SzpsTBgr5kAT4p5zgH5d3T3KPtDnQ10b8IS+JFJYH1D2m6AyO1fTkHQ53vatww0 x-ms-office365-filtering-correlation-id: 5a3637a2-9005-40e9-2857-08d562e149a9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(767451399110); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1080;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1080; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(346002)(39860400002)(39380400002)(366004)(189003)(199004)(8666007)(72206003)(110136005)(316002)(5250100002)(6346003)(2900100001)(54906003)(1076002)(6116002)(3846002)(22452003)(36756003)(53936002)(99286004)(6512007)(68736007)(2501003)(3660700001)(14454004)(3280700002)(86362001)(102836004)(7736002)(5660300001)(305945005)(107886003)(6486002)(6506007)(2906002)(81156014)(26005)(25786009)(4326008)(81166006)(39060400002)(105586002)(8936002)(106356001)(478600001)(10290500003)(6436002)(8676002)(2950100002)(86612001)(97736004)(76176011)(6666003)(10090500001)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1080;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Om0V1sY7R4pM+eQD3J8obObZD0JjosMoIlqCJVHROeeacrW23utgZqIinjcTf8JwUghf6UxEa7aPx3uyGnfGpw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a3637a2-9005-40e9-2857-08d562e149a9 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:36.3108 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Felix Kuehling [ Upstream commit 8c946b8988acec785bcf67088b6bd0747f36d2d3 ] SDMA only supports a fixed number of queues. HWS cannot handle oversubscription. Signed-off-by: shaoyun liu Signed-off-by: Felix Kuehling Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 ++++++++++++++= ++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drive= rs/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c index e1fb40b84c72..5425c68d0287 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c @@ -205,6 +205,24 @@ int pqm_create_queue(struct process_queue_manager *pqm= , =20 switch (type) { case KFD_QUEUE_TYPE_SDMA: + if (dev->dqm->queue_count >=3D + CIK_SDMA_QUEUES_PER_ENGINE * CIK_SDMA_ENGINE_NUM) { + pr_err("Over-subscription is not allowed for SDMA.\n"); + retval =3D -EPERM; + goto err_create_queue; + } + + retval =3D create_cp_queue(pqm, dev, &q, properties, f, *qid); + if (retval !=3D 0) + goto err_create_queue; + pqn->q =3D q; + pqn->kq =3D NULL; + retval =3D dev->dqm->ops.create_queue(dev->dqm, q, &pdd->qpd, + &q->properties.vmid); + pr_debug("DQM returned %d for create_queue\n", retval); + print_queue(q); + break; + case KFD_QUEUE_TYPE_COMPUTE: /* check if there is over subscription */ if ((sched_policy =3D=3D KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION) && --=20 2.11.0