From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D2D52C43381 for ; Wed, 27 Mar 2019 19:23:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A30192075C for ; Wed, 27 Mar 2019 19:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553714604; bh=EpLJ3u0C6+VxruNbP/k5cof3OA9WelL0IhLBMySVgG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kC2IvtyVEE5NbJwlt4iKuDZ/mcnRKxcgdJGVhZTHQFhfn+DKT/CaS3T2wCYZNs6r6 rx6f6vWZjvFqfQO96F9cXLjBOsu/RJ5LWuwUnCkKWrMXfv7TyAWbln+FMCdw8e8Dcv 1C5AXvZW9Yss+E+ID37qxdcfn5z8CT3mN30ROwJ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387993AbfC0TXX (ORCPT ); Wed, 27 Mar 2019 15:23:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387862AbfC0SGH (ORCPT ); Wed, 27 Mar 2019 14:06:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 902E021734; Wed, 27 Mar 2019 18:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709966; bh=EpLJ3u0C6+VxruNbP/k5cof3OA9WelL0IhLBMySVgG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MQ6QjnDl4vsMtdvKyGKuvuW9Mxq6DNRx/+Z+lf3dRYrdT25/1i9t79qApCE3Gx0DO 8N0MrDpx4lGR9Rc5HsciNlG0Jg71KdJqnP9zJR1/AzTPJXG+/JM4xpMthu/zaMB3YK xiPXJbPaYAdLvikuTz4ZXRBETf54tI8DBtRq0o8Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bas Nieuwenhuizen , Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.0 135/262] drm/sched: Fix entities with 0 rqs. Date: Wed, 27 Mar 2019 13:59:50 -0400 Message-Id: <20190327180158.10245-135-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bas Nieuwenhuizen [ Upstream commit 1decbf6bb0b4dc56c9da6c5e57b994ebfc2be3aa ] Some blocks in amdgpu can have 0 rqs. Job creation already fails with -ENOENT when entity->rq is NULL, so jobs cannot be pushed. Without a rq there is no scheduler to pop jobs, and rq selection already does the right thing with a list of length 0. So the operations we need to fix are: - Creation, do not set rq to rq_list[0] if the list can have length 0. - Do not flush any jobs when there is no rq. - On entity destruction handle the rq = NULL case. - on set_priority, do not try to change the rq if it is NULL. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/scheduler/sched_entity.c | 39 ++++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index e2942c9a11a7..35ddbec1375a 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -52,12 +52,12 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, { int i; - if (!(entity && rq_list && num_rq_list > 0 && rq_list[0])) + if (!(entity && rq_list && (num_rq_list == 0 || rq_list[0]))) return -EINVAL; memset(entity, 0, sizeof(struct drm_sched_entity)); INIT_LIST_HEAD(&entity->list); - entity->rq = rq_list[0]; + entity->rq = NULL; entity->guilty = guilty; entity->num_rq_list = num_rq_list; entity->rq_list = kcalloc(num_rq_list, sizeof(struct drm_sched_rq *), @@ -67,6 +67,10 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, for (i = 0; i < num_rq_list; ++i) entity->rq_list[i] = rq_list[i]; + + if (num_rq_list) + entity->rq = rq_list[0]; + entity->last_scheduled = NULL; spin_lock_init(&entity->rq_lock); @@ -165,6 +169,9 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout) struct task_struct *last_user; long ret = timeout; + if (!entity->rq) + return 0; + sched = entity->rq->sched; /** * The client will not queue more IBs during this fini, consume existing @@ -264,20 +271,24 @@ static void drm_sched_entity_kill_jobs(struct drm_sched_entity *entity) */ void drm_sched_entity_fini(struct drm_sched_entity *entity) { - struct drm_gpu_scheduler *sched; + struct drm_gpu_scheduler *sched = NULL; - sched = entity->rq->sched; - drm_sched_rq_remove_entity(entity->rq, entity); + if (entity->rq) { + sched = entity->rq->sched; + drm_sched_rq_remove_entity(entity->rq, entity); + } /* Consumption of existing IBs wasn't completed. Forcefully * remove them here. */ if (spsc_queue_peek(&entity->job_queue)) { - /* Park the kernel for a moment to make sure it isn't processing - * our enity. - */ - kthread_park(sched->thread); - kthread_unpark(sched->thread); + if (sched) { + /* Park the kernel for a moment to make sure it isn't processing + * our enity. + */ + kthread_park(sched->thread); + kthread_unpark(sched->thread); + } if (entity->dependency) { dma_fence_remove_callback(entity->dependency, &entity->cb); @@ -362,9 +373,11 @@ void drm_sched_entity_set_priority(struct drm_sched_entity *entity, for (i = 0; i < entity->num_rq_list; ++i) drm_sched_entity_set_rq_priority(&entity->rq_list[i], priority); - drm_sched_rq_remove_entity(entity->rq, entity); - drm_sched_entity_set_rq_priority(&entity->rq, priority); - drm_sched_rq_add_entity(entity->rq, entity); + if (entity->rq) { + drm_sched_rq_remove_entity(entity->rq, entity); + drm_sched_entity_set_rq_priority(&entity->rq, priority); + drm_sched_rq_add_entity(entity->rq, entity); + } spin_unlock(&entity->rq_lock); } -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.0 135/262] drm/sched: Fix entities with 0 rqs. Date: Wed, 27 Mar 2019 13:59:50 -0400 Message-ID: <20190327180158.10245-135-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6590889CA0 for ; Wed, 27 Mar 2019 18:06:06 +0000 (UTC) In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQmFzIE5pZXV3ZW5odWl6ZW4gPGJhc0BiYXNuaWV1d2VuaHVpemVuLm5sPgoKWyBVcHN0 cmVhbSBjb21taXQgMWRlY2JmNmJiMGI0ZGM1NmM5ZGE2YzVlNTdiOTk0ZWJmYzJiZTNhYSBdCgpT b21lIGJsb2NrcyBpbiBhbWRncHUgY2FuIGhhdmUgMCBycXMuCgpKb2IgY3JlYXRpb24gYWxyZWFk eSBmYWlscyB3aXRoIC1FTk9FTlQgd2hlbiBlbnRpdHktPnJxIGlzIE5VTEwsCnNvIGpvYnMgY2Fu bm90IGJlIHB1c2hlZC4gV2l0aG91dCBhIHJxIHRoZXJlIGlzIG5vIHNjaGVkdWxlciB0bwpwb3Ag am9icywgYW5kIHJxIHNlbGVjdGlvbiBhbHJlYWR5IGRvZXMgdGhlIHJpZ2h0IHRoaW5nIHdpdGgg YQpsaXN0IG9mIGxlbmd0aCAwLgoKU28gdGhlIG9wZXJhdGlvbnMgd2UgbmVlZCB0byBmaXggYXJl OgogIC0gQ3JlYXRpb24sIGRvIG5vdCBzZXQgcnEgdG8gcnFfbGlzdFswXSBpZiB0aGUgbGlzdCBj YW4gaGF2ZSBsZW5ndGggMC4KICAtIERvIG5vdCBmbHVzaCBhbnkgam9icyB3aGVuIHRoZXJlIGlz IG5vIHJxLgogIC0gT24gZW50aXR5IGRlc3RydWN0aW9uIGhhbmRsZSB0aGUgcnEgPSBOVUxMIGNh c2UuCiAgLSBvbiBzZXRfcHJpb3JpdHksIGRvIG5vdCB0cnkgdG8gY2hhbmdlIHRoZSBycSBpZiBp dCBpcyBOVUxMLgoKU2lnbmVkLW9mZi1ieTogQmFzIE5pZXV3ZW5odWl6ZW4gPGJhc0BiYXNuaWV1 d2VuaHVpemVuLm5sPgpSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtv ZW5pZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVj aGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9y Zz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL3NjaGVkX2VudGl0eS5jIHwgMzkgKysr KysrKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwg MTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9z Y2hlZF9lbnRpdHkuYyBiL2RyaXZlcnMvZ3B1L2RybS9zY2hlZHVsZXIvc2NoZWRfZW50aXR5LmMK aW5kZXggZTI5NDJjOWExMWE3Li4zNWRkYmVjMTM3NWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9zY2hlZHVsZXIvc2NoZWRfZW50aXR5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3NjaGVk dWxlci9zY2hlZF9lbnRpdHkuYwpAQCAtNTIsMTIgKzUyLDEyIEBAIGludCBkcm1fc2NoZWRfZW50 aXR5X2luaXQoc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSwKIHsKIAlpbnQgaTsKIAot CWlmICghKGVudGl0eSAmJiBycV9saXN0ICYmIG51bV9ycV9saXN0ID4gMCAmJiBycV9saXN0WzBd KSkKKwlpZiAoIShlbnRpdHkgJiYgcnFfbGlzdCAmJiAobnVtX3JxX2xpc3QgPT0gMCB8fCBycV9s aXN0WzBdKSkpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJbWVtc2V0KGVudGl0eSwgMCwgc2l6ZW9m KHN0cnVjdCBkcm1fc2NoZWRfZW50aXR5KSk7CiAJSU5JVF9MSVNUX0hFQUQoJmVudGl0eS0+bGlz dCk7Ci0JZW50aXR5LT5ycSA9IHJxX2xpc3RbMF07CisJZW50aXR5LT5ycSA9IE5VTEw7CiAJZW50 aXR5LT5ndWlsdHkgPSBndWlsdHk7CiAJZW50aXR5LT5udW1fcnFfbGlzdCA9IG51bV9ycV9saXN0 OwogCWVudGl0eS0+cnFfbGlzdCA9IGtjYWxsb2MobnVtX3JxX2xpc3QsIHNpemVvZihzdHJ1Y3Qg ZHJtX3NjaGVkX3JxICopLApAQCAtNjcsNiArNjcsMTAgQEAgaW50IGRybV9zY2hlZF9lbnRpdHlf aW5pdChzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0eSAqZW50aXR5LAogCiAJZm9yIChpID0gMDsgaSA8 IG51bV9ycV9saXN0OyArK2kpCiAJCWVudGl0eS0+cnFfbGlzdFtpXSA9IHJxX2xpc3RbaV07CisK KwlpZiAobnVtX3JxX2xpc3QpCisJCWVudGl0eS0+cnEgPSBycV9saXN0WzBdOworCiAJZW50aXR5 LT5sYXN0X3NjaGVkdWxlZCA9IE5VTEw7CiAKIAlzcGluX2xvY2tfaW5pdCgmZW50aXR5LT5ycV9s b2NrKTsKQEAgLTE2NSw2ICsxNjksOSBAQCBsb25nIGRybV9zY2hlZF9lbnRpdHlfZmx1c2goc3Ry dWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSwgbG9uZyB0aW1lb3V0KQogCXN0cnVjdCB0YXNr X3N0cnVjdCAqbGFzdF91c2VyOwogCWxvbmcgcmV0ID0gdGltZW91dDsKIAorCWlmICghZW50aXR5 LT5ycSkKKwkJcmV0dXJuIDA7CisKIAlzY2hlZCA9IGVudGl0eS0+cnEtPnNjaGVkOwogCS8qKgog CSAqIFRoZSBjbGllbnQgd2lsbCBub3QgcXVldWUgbW9yZSBJQnMgZHVyaW5nIHRoaXMgZmluaSwg Y29uc3VtZSBleGlzdGluZwpAQCAtMjY0LDIwICsyNzEsMjQgQEAgc3RhdGljIHZvaWQgZHJtX3Nj aGVkX2VudGl0eV9raWxsX2pvYnMoc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVudGl0eSkKICAq Lwogdm9pZCBkcm1fc2NoZWRfZW50aXR5X2Zpbmkoc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVu dGl0eSkKIHsKLQlzdHJ1Y3QgZHJtX2dwdV9zY2hlZHVsZXIgKnNjaGVkOworCXN0cnVjdCBkcm1f Z3B1X3NjaGVkdWxlciAqc2NoZWQgPSBOVUxMOwogCi0Jc2NoZWQgPSBlbnRpdHktPnJxLT5zY2hl ZDsKLQlkcm1fc2NoZWRfcnFfcmVtb3ZlX2VudGl0eShlbnRpdHktPnJxLCBlbnRpdHkpOworCWlm IChlbnRpdHktPnJxKSB7CisJCXNjaGVkID0gZW50aXR5LT5ycS0+c2NoZWQ7CisJCWRybV9zY2hl ZF9ycV9yZW1vdmVfZW50aXR5KGVudGl0eS0+cnEsIGVudGl0eSk7CisJfQogCiAJLyogQ29uc3Vt cHRpb24gb2YgZXhpc3RpbmcgSUJzIHdhc24ndCBjb21wbGV0ZWQuIEZvcmNlZnVsbHkKIAkgKiBy ZW1vdmUgdGhlbSBoZXJlLgogCSAqLwogCWlmIChzcHNjX3F1ZXVlX3BlZWsoJmVudGl0eS0+am9i X3F1ZXVlKSkgewotCQkvKiBQYXJrIHRoZSBrZXJuZWwgZm9yIGEgbW9tZW50IHRvIG1ha2Ugc3Vy ZSBpdCBpc24ndCBwcm9jZXNzaW5nCi0JCSAqIG91ciBlbml0eS4KLQkJICovCi0JCWt0aHJlYWRf cGFyayhzY2hlZC0+dGhyZWFkKTsKLQkJa3RocmVhZF91bnBhcmsoc2NoZWQtPnRocmVhZCk7CisJ CWlmIChzY2hlZCkgeworCQkJLyogUGFyayB0aGUga2VybmVsIGZvciBhIG1vbWVudCB0byBtYWtl IHN1cmUgaXQgaXNuJ3QgcHJvY2Vzc2luZworCQkJICogb3VyIGVuaXR5LgorCQkJICovCisJCQlr dGhyZWFkX3Bhcmsoc2NoZWQtPnRocmVhZCk7CisJCQlrdGhyZWFkX3VucGFyayhzY2hlZC0+dGhy ZWFkKTsKKwkJfQogCQlpZiAoZW50aXR5LT5kZXBlbmRlbmN5KSB7CiAJCQlkbWFfZmVuY2VfcmVt b3ZlX2NhbGxiYWNrKGVudGl0eS0+ZGVwZW5kZW5jeSwKIAkJCQkJCSAgJmVudGl0eS0+Y2IpOwpA QCAtMzYyLDkgKzM3MywxMSBAQCB2b2lkIGRybV9zY2hlZF9lbnRpdHlfc2V0X3ByaW9yaXR5KHN0 cnVjdCBkcm1fc2NoZWRfZW50aXR5ICplbnRpdHksCiAJZm9yIChpID0gMDsgaSA8IGVudGl0eS0+ bnVtX3JxX2xpc3Q7ICsraSkKIAkJZHJtX3NjaGVkX2VudGl0eV9zZXRfcnFfcHJpb3JpdHkoJmVu dGl0eS0+cnFfbGlzdFtpXSwgcHJpb3JpdHkpOwogCi0JZHJtX3NjaGVkX3JxX3JlbW92ZV9lbnRp dHkoZW50aXR5LT5ycSwgZW50aXR5KTsKLQlkcm1fc2NoZWRfZW50aXR5X3NldF9ycV9wcmlvcml0 eSgmZW50aXR5LT5ycSwgcHJpb3JpdHkpOwotCWRybV9zY2hlZF9ycV9hZGRfZW50aXR5KGVudGl0 eS0+cnEsIGVudGl0eSk7CisJaWYgKGVudGl0eS0+cnEpIHsKKwkJZHJtX3NjaGVkX3JxX3JlbW92 ZV9lbnRpdHkoZW50aXR5LT5ycSwgZW50aXR5KTsKKwkJZHJtX3NjaGVkX2VudGl0eV9zZXRfcnFf cHJpb3JpdHkoJmVudGl0eS0+cnEsIHByaW9yaXR5KTsKKwkJZHJtX3NjaGVkX3JxX2FkZF9lbnRp dHkoZW50aXR5LT5ycSwgZW50aXR5KTsKKwl9CiAKIAlzcGluX3VubG9jaygmZW50aXR5LT5ycV9s b2NrKTsKIH0KLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs