Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4569653pxv; Tue, 6 Jul 2021 04:18:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPbwVyZ9jgxpn/qk+XyHQtHkz5gLO9mufG17QFfWOzvczpYseciZq+ytYe5xAvGrhvrOLb X-Received: by 2002:a6b:6209:: with SMTP id f9mr12126929iog.147.1625570283709; Tue, 06 Jul 2021 04:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570283; cv=none; d=google.com; s=arc-20160816; b=OzdZyw1+9Ub3aZqt+NJ/Y3MgH/FHZRyAzgflKoqjBZ8wZKL5NxTsMGUmyeQDrt3rkh 7Rd9JoLQpy1uY/BsOApu77AmZPAY/VVE84PPt2g8wivz/cTGtnCxhEHvN/XFIU4Gd+Of ijbvEQdQPxYatbupv75u+oFhKNjPX1b/dhO7UBwFIC0G8MLHjLQihdYXm6I4OOMXFRRK 9ddbI1sDeTgKcx+MNXbMbB8gWdMg1FFzTfoOd/yDwNJJtJmsHdNC1lqwdH3yTC8YkBdo qiJaMb5ZwGHJ38EuoXUKGQOogPpBvUlyjDDIQnFJm5gBYiDpE62f8oXzIjqtrHJ3ZZEK IJlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=foECYzcZ1dp4uRdcDSHJ1fwhbZ0XqN04ze420s8A980=; b=PnkNqCQ50QF/gafHsoA9xe6TdfznaiFSTItTJXsqntLPPpgHoXtT3dl8hnWPfszpOT kg8+j02BS/UErGnTNbkfGZG0GYTDp/Zn4147Xo7Gq66XIQN27Wh0NQfmJnqZHSLD6x// CPwIlwjrqMnOgH2reG6z/JKDGa7zk/rVREJ1Gs4OvmCf5h93+ownh/L0vvQvFDcorYZe 2PidA/v/cF03Q0r67B+do7nNDY2C9FACE0qpGziB3nGO+5LHvTikAn+/qL6w4id4IKBk DZNSn0Gs4RsjKp6KrpFmWFroN1GreuJVdsjBrJcFo5fgJms/e4wk1bE/WZQgtg72LLaf dQKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hwbyngXl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k19si18087155ion.69.2021.07.06.04.17.51; Tue, 06 Jul 2021 04:18:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hwbyngXl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231960AbhGFLSl (ORCPT + 99 others); Tue, 6 Jul 2021 07:18:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:53294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232147AbhGFLRp (ORCPT ); Tue, 6 Jul 2021 07:17:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A9F5561C28; Tue, 6 Jul 2021 11:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570106; bh=cUqT5HGXumM4TBFcuqG8XVP4oJ3+IBDFlH7m3Z1t154=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hwbyngXl1YJLoEsZ0eolRbLa5tMeWuxPkZywP8RFwD7IfEuVRt69yOfZvyCLYD7JB aBMepA1/mKFtzQb0Mjj7cQ6vnkqFv1BIqLZKBN55lCtk2Gvs8PH61oGNW/f658wZOT Q5ygrGm4qpUhu12VYRubxvjSeXrHyh1I4atQfFC1O7fj3ugUUUD290VtJPAoUBDznR hBdUY6cpfo28cEJN9aTu2P/071foosx5RRw2QROrR56n3h80qvWdlBreGVWXtfJRzy H4KN5aZSuyCq58s4yDVWD6sgboGbdKYcfs5YbhJPR0j9ByzreCGzJEvkZcUcr8AYPo HuXymxGhaF99Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrey Grodzovsky , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sasha Levin , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH AUTOSEL 5.13 039/189] drm/sched: Avoid data corruptions Date: Tue, 6 Jul 2021 07:11:39 -0400 Message-Id: <20210706111409.2058071-39-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Grodzovsky [ Upstream commit 0b10ab80695d61422337ede6ff496552d8ace99d ] Wait for all dependencies of a job to complete before killing it to avoid data corruptions. Signed-off-by: Andrey Grodzovsky Reviewed-by: Christian König Link: https://patchwork.freedesktop.org/patch/msgid/20210519141407.88444-1-andrey.grodzovsky@amd.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/scheduler/sched_entity.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index cb58f692dad9..86a4209d8c77 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -222,11 +222,16 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f, static void drm_sched_entity_kill_jobs(struct drm_sched_entity *entity) { struct drm_sched_job *job; + struct dma_fence *f; int r; while ((job = to_drm_sched_job(spsc_queue_pop(&entity->job_queue)))) { struct drm_sched_fence *s_fence = job->s_fence; + /* Wait for all dependencies to avoid data corruptions */ + while ((f = job->sched->ops->dependency(job, entity))) + dma_fence_wait(f, false); + drm_sched_fence_scheduled(s_fence); dma_fence_set_error(&s_fence->finished, -ESRCH); -- 2.30.2