From patchwork Fri Jul 31 22:22:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6920821 Return-Path: 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 6F585C05AD for ; Fri, 31 Jul 2015 22:23:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BF4F2068D for ; Fri, 31 Jul 2015 22:23:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8FEBE20631 for ; Fri, 31 Jul 2015 22:23:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1F746EE00; Fri, 31 Jul 2015 15:23:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f170.google.com (mail-yk0-f170.google.com [209.85.160.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B19A6EE06 for ; Fri, 31 Jul 2015 15:23:04 -0700 (PDT) Received: by ykdu72 with SMTP id u72so70392956ykd.2 for ; Fri, 31 Jul 2015 15:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ky0QYzwny0Dc9OXBFSJoX0nr8zSnv8ESwnqoevvM4HA=; b=cVjm+6mLWtXIZuVKf7CwkTY4dUb78Pxl3Jc0dEGLrkY6eusSo6sVYm6DundQEYwKrb XPxoeQAhGseZSjkPiqSZo0t2KJ6U/BfN6BFyekWy2nv7Hvti9NlJLV5nebna3VoLKhnl uyGu125UnCleaA1J0wSEaYPq4fAxdOyZvdpmwtSSVKsRfUw1gv/OVTZ0n4XeMr42iM1B 1w6oMl5+lnDgIyq/FBsUnUt3AmXUXLh8eelARD1lVGgeFAevl2zwyZkRZ1UmMOiFcrGJ 9iPVQFCUe8+L4Qd1RBx8I1TCqdC4RSwSaIKMYk9eeNw34xnmHOl7+HxuDt+uir9wD38g Z3pA== X-Received: by 10.129.109.210 with SMTP id i201mr6270902ywc.23.1438381383547; Fri, 31 Jul 2015 15:23:03 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id u78sm5438990ywu.13.2015.07.31.15.23.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 15:23:03 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 14/31] drm/amdgpu: protect fence_process from multiple context Date: Fri, 31 Jul 2015 18:22:30 -0400 Message-Id: <1438381367-24980-15-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1438381367-24980-1-git-send-email-alexander.deucher@amd.com> References: <1438381367-24980-1-git-send-email-alexander.deucher@amd.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Chunming Zhou fence_process may be called from kthread, user thread and interrupt context. it is possible to called concurrently, then will wake up fence queue multiple times. Signed-off-by: Chunming Zhou Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6a71047..5a7a3c4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -868,6 +868,7 @@ struct amdgpu_ring { struct amdgpu_fence_driver fence_drv; struct amd_gpu_scheduler *scheduler; + spinlock_t fence_lock; struct mutex *ring_lock; struct amdgpu_bo *ring_obj; volatile uint32_t *ring; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 601f264..faee350 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -295,6 +295,7 @@ void amdgpu_fence_process(struct amdgpu_ring *ring) uint64_t seq, last_seq, last_emitted; unsigned count_loop = 0; bool wake = false; + unsigned long irqflags; /* Note there is a scenario here for an infinite loop but it's * very unlikely to happen. For it to happen, the current polling @@ -317,6 +318,7 @@ void amdgpu_fence_process(struct amdgpu_ring *ring) * have temporarly set the last_seq not to the true real last * seq but to an older one. */ + spin_lock_irqsave(&ring->fence_lock, irqflags); last_seq = atomic64_read(&ring->fence_drv.last_seq); do { last_emitted = ring->fence_drv.sync_seq[ring->idx]; @@ -355,7 +357,7 @@ void amdgpu_fence_process(struct amdgpu_ring *ring) if (handled_seq == latest_seq) { DRM_ERROR("ring %d, EOP without seq update (lastest_seq=%llu)\n", ring->idx, latest_seq); - return; + goto exit; } do { amd_sched_isr(ring->scheduler); @@ -364,6 +366,8 @@ void amdgpu_fence_process(struct amdgpu_ring *ring) wake_up_all(&ring->adev->fence_queue); } +exit: + spin_unlock_irqrestore(&ring->fence_lock, irqflags); } /** diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 855e219..1e68a56 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -367,7 +367,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, } ring->next_rptr_gpu_addr = adev->wb.gpu_addr + (ring->next_rptr_offs * 4); ring->next_rptr_cpu_addr = &adev->wb.wb[ring->next_rptr_offs]; - + spin_lock_init(&ring->fence_lock); r = amdgpu_fence_driver_start_ring(ring, irq_src, irq_type); if (r) { dev_err(adev->dev, "failed initializing fences (%d).\n", r);