From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768230-2-16800085651803411059 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 en, 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=1516768230; b=QbWZgNM7YMHA0jfpJKKI3PKj4X1kuo3tVEG0LmZ6sgEm8i3 HqqMk1hb9g4iSawlXhQzsrRXhlJ9zlsTb5scb8LBUDUq60xX2jD2kqJgpy4palIo scg36PMVUqZeE8uu98H9zCIOGIGTjWHlNH3xL7vPDpkxHGh9ZAjbAlQyeEFWJjbY +JVVfX7Q4S14EkCkUiVh8pxtVh20Bkx312qXE+g7//35btJ87x780/GCbY4U6cJv eM918N6PIKvOnkmuLx8hHqKkCUl3OS6yeKLxlB8J4E0ijlN9cTpeKNtqaYamW5v6 nQ+BnH/0zAqWPu/+ilpJEhgmuaWOMwlBZwAsWUQ== 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=1516768230; bh=78xA6w ZobVK0MvDgiyPdDAl0/EobxQYWHK6tKD8CwLc=; b=M3UDpRrrmKzl9NomOWFCUE qE6P+YCRoWR0cBm175lZshkdBjiGQu65MF890s6Wi8DguzHLh3ORVx2u6xvQW1Cg clop4l4ikEmBlWmMlP9oMLXx4J758pAf2my9Z0ZFfwx/VH5baLTxZijQi/PRwYU2 4ltzeTdgzibG6PetW0N8+rHI3xp4HUGznd/o+J+wq3Mk8Bqr0s/17bTBQBziyL1l oofcuptKzIvR5d9EERcUkJfRvvcd6rD6P56wxmwBeQ/HnMvNZM0TkK3bkAc8Qyk1 aaqP//emvsYRaxbFpJ3nYfu8dpP0A0LULDHgxjAZnUHOg3soGb8PlW4z1/GvaaZw == 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=YEtX3Ui6 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=YEtX3Ui6 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 S933122AbeAXE3p (ORCPT ); Tue, 23 Jan 2018 23:29:45 -0500 Received: from mail-dm3nam03on0104.outbound.protection.outlook.com ([104.47.41.104]:64192 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933185AbeAXETX (ORCPT ); Tue, 23 Jan 2018 23:19:23 -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.4 12/35] drm/amdkfd: Fix SDMA oversubsription handling Thread-Topic: [PATCH AUTOSEL for 4.4 12/35] drm/amdkfd: Fix SDMA oversubsription handling Thread-Index: AQHTlMosFaXyLsHtlE2ox0TDbSl/Yg== Date: Wed, 24 Jan 2018 04:16:58 +0000 Message-ID: <20180124041645.32420-12-alexander.levin@microsoft.com> References: <20180124041645.32420-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041645.32420-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;DM5PR2101MB1094;6:jy7SwLDMCbV+Y30uZB/wua0japsDpLbrsJjIvQwSsUvVW+T6/y9AAp8MbqfWvwZI65jr+1GxElk9E97WbDT+9hdrd3r2mPDQlOsbJUAHWr35sCG4lGfSb8sRrDrvAStrOD482G3/g0ZdgjiP7U4P+g7ST1XH3D10uX5H8d77juK8njSj+s7lVwcB574Wyn8MOUNHD/Zh3C2Tl6fV9sk54+BpsSxgbd/VrzHvIhJ3QgbWE4LldG5c5AgusHa62XPB+KTKn/s1BfmBTG2moj3nHRlYudjOpYvXhHShUern8Sno6Fs8Al9lmXz7nyll5xqTHgQCVZDhBHzf+4xvYecsKWNQvgf5kxharE73CTCYAZ+9z8N/ihuQs6qyKM95VCpa;5:TRCIEr2qj9WZ143+Z960VXRjtEd4UdKPfdaXFYdAZQLpbAlGtq6LOEm5hYvZAg+dpgytHls4fo02O2hG49dIkpldsChY3fvpxBWPS0Shi5OhRCixf6vUzYNYa7FBQq6TUaucY76Vay41xkKNASNto62l6LSs3WfcTj+HwfE3i/k=;24:i/txY1aLRFN2fC5we2fQBccxlOEjXnjlVSPxm+3j5n5qZWQUMVyH5oDC2yvmeGE2QRgMQxQmPO6YIRadiNeHd5Iw4w2vPhga1BVat1AWyOA=;7:Hf9Xrf/Ics8UchlWlTSh5Q/3v3cg7OQDWQlWcPT5FPYkLUt6lebIsXfBxe331cdOOdaoflc9q4Z6ZEqARm5rcvWcQBAThCP1RDbG4M3OBnl6of+l9uu/aQntn5sEn5Pq1pba30Xdu9j5nQAzycOcqUEcYK1jeo61S+MhPoGIl3qkvIjD2yn4+cL94I6ouGw2dw/iLxdNpAgK9/j58ZmRP7KpKGhdCeMNLUCyW99k00kvHar13zf852NoasTqggCc x-ms-office365-filtering-correlation-id: 72ab55e6-5712-427b-1695-08d562e1a39a 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:DM5PR2101MB1094; x-ms-traffictypediagnostic: DM5PR2101MB1094: 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)(3231046)(2400081)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1094;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1094; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(14454004)(99286004)(10090500001)(2906002)(86612001)(2900100001)(2950100002)(107886003)(5250100002)(2501003)(26005)(316002)(4326008)(97736004)(54906003)(106356001)(110136005)(25786009)(6666003)(5660300001)(36756003)(305945005)(39060400002)(86362001)(8936002)(8666007)(3280700002)(6116002)(68736007)(102836004)(3660700001)(6512007)(10290500003)(72206003)(1076002)(105586002)(6436002)(22452003)(53936002)(478600001)(3846002)(7736002)(6486002)(6346003)(81156014)(66066001)(6506007)(8676002)(76176011)(81166006)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1094;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: gXkDack7v/ckHDW9NCKFks712/Mg3rmG8x5cctnlXyA56X4JGYLXjs8iYhx9gJ6X90FI4mw/bQ/zXmEDh0+syw== 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: 72ab55e6-5712-427b-1695-08d562e1a39a X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:16:58.1785 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1094 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 7b69070f7ecc..aa41b840048f 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