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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6B5FC433F5 for ; Tue, 4 Jan 2022 07:36:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232245AbiADHgR (ORCPT ); Tue, 4 Jan 2022 02:36:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbiADHgP (ORCPT ); Tue, 4 Jan 2022 02:36:15 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12017C061761; Mon, 3 Jan 2022 23:36:15 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id k18so37587397wrg.11; Mon, 03 Jan 2022 23:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5QgurAW0lNK9DtZ5aiYOIjTcb84ucRlepZxkJq+T308=; b=GatvyyE/kBqheoYQ/d13MygNqovRYyBIG1SdlHBTM1JWbwgDE3yn5BdZmHzV8HNnvD rmimV5S7wUikeOcwGIyS15JbLAw7OU1rycZIfjDo20/Z+pwuC3BigTkotG+zY4Z3RYi2 e3Na7QyiJiekB7fK2RCVkTJKTz/P8RzAoNvkGvsJH8h2hE7U8ECkMOXtgytKJdpoqgOF IUTKXMadctzVM8Lvz9v06fMMeae/oeEe4C8ta1Fai/ggwnhkSQ1ORvJy7e4G5uk+p81v nPgtzhQqJCGHo8e/zXUhVqDmmFor3xL5Wzpl6GyWhqpLJmRwhIxS2YHwtQMLBUXGuPg5 ITsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5QgurAW0lNK9DtZ5aiYOIjTcb84ucRlepZxkJq+T308=; b=fwkO3w4qBVxfEnYKVSHXXG0gLl4LWmViTXYzsLVDoiDgJCUqiVagc2Vy8IGcXGl34o cOd0xkfIOdoK/lmQybhkEhgjBCXnkAJYAxI6nqpwOttQmX0P7K1ldETBEcR9t1xrOJr0 7Yw9xsvL+EVl/8NZkJXk/C7BBLLHw6QwKq/Lqh4giU5bDV0pcyE9oao5n2xstGvFov0M ikLPSke6vkqa4aJ3Yc7Hl+FVxDapxn4EKihUSDOl9lHLllZvYi+NecwTWhhZ6LOGHEss ZOi2YYOT0MY8MgZEo606DmJ+YVeH1Df/EfJ8RD7h786uJQNNAyFHenrSA86pAf12ydfO C7Ng== X-Gm-Message-State: AOAM531hh8XUocCJZ0oJN/fTZHO6N5iKIXFhZ3BBoZzI9RzyzX/A1z5U lOEfd0Sgy7JDkWOPzjT4ies= X-Google-Smtp-Source: ABdhPJwWuBVqvqiAa6SL5fPaQqllfHGw/SdK0Uc5+CN6wLMv/wwUKJbrSULom+MJXNBTgh1mRkzIPw== X-Received: by 2002:a05:6000:2aa:: with SMTP id l10mr42207978wry.518.1641281773701; Mon, 03 Jan 2022 23:36:13 -0800 (PST) Received: from ownia.. ([103.105.48.220]) by smtp.gmail.com with ESMTPSA id l12sm43064477wmq.2.2022.01.03.23.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 23:36:13 -0800 (PST) From: Weizhao Ouyang To: Sumit Semwal , Benjamin Gaignard , Liam Mark , Laura Abbott , Brian Starkey , John Stultz , christian.koenig@amd.com Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Weizhao Ouyang Subject: [PATCH] dma-buf: cma_heap: Fix mutex locking section Date: Tue, 4 Jan 2022 15:35:45 +0800 Message-Id: <20220104073545.124244-1-o451686892@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix cma_heap_buffer mutex locking critical section to protect vmap_cnt and vaddr. Fixes: a5d2d29e24be ("dma-buf: heaps: Move heap-helper logic into the cma_heap implementation") Signed-off-by: Weizhao Ouyang --- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 0c05b79870f9..83f02bd51dda 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, struct cma_heap_buffer *buffer = dmabuf->priv; struct dma_heap_attachment *a; + mutex_lock(&buffer->lock); + if (buffer->vmap_cnt) invalidate_kernel_vmap_range(buffer->vaddr, buffer->len); - mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { if (!a->mapped) continue; @@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf, struct cma_heap_buffer *buffer = dmabuf->priv; struct dma_heap_attachment *a; + mutex_lock(&buffer->lock); + if (buffer->vmap_cnt) flush_kernel_vmap_range(buffer->vaddr, buffer->len); - mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { if (!a->mapped) continue; -- 2.32.0 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D538AC433EF for ; Wed, 5 Jan 2022 08:25:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AFDAE10E74F; Wed, 5 Jan 2022 08:24:56 +0000 (UTC) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FF1310E20D for ; Tue, 4 Jan 2022 07:36:15 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id r17so74288031wrc.3 for ; Mon, 03 Jan 2022 23:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5QgurAW0lNK9DtZ5aiYOIjTcb84ucRlepZxkJq+T308=; b=GatvyyE/kBqheoYQ/d13MygNqovRYyBIG1SdlHBTM1JWbwgDE3yn5BdZmHzV8HNnvD rmimV5S7wUikeOcwGIyS15JbLAw7OU1rycZIfjDo20/Z+pwuC3BigTkotG+zY4Z3RYi2 e3Na7QyiJiekB7fK2RCVkTJKTz/P8RzAoNvkGvsJH8h2hE7U8ECkMOXtgytKJdpoqgOF IUTKXMadctzVM8Lvz9v06fMMeae/oeEe4C8ta1Fai/ggwnhkSQ1ORvJy7e4G5uk+p81v nPgtzhQqJCGHo8e/zXUhVqDmmFor3xL5Wzpl6GyWhqpLJmRwhIxS2YHwtQMLBUXGuPg5 ITsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5QgurAW0lNK9DtZ5aiYOIjTcb84ucRlepZxkJq+T308=; b=i2gKfuIgrE3JnxvM+YbXPQoqsKiEGPieXfuqTK6x/1eNhCdIk0ehgpRaduqzPb92VR qTaE5sA/rAHlVPe5ChdSm6ILt7x6Tmh/Eg0PLEqzoXauTuwpF4Kr4C+nuYQqtbPO6mtT MM1bTkJ/9gkdn8i9jfeAjDwZVxn/8uPFlLEhjyjPqUyMCr/45XoRDRIlU58r01A7r78m zLTZW4f85zYUiOFnKc1wbzvCPMdLKSFPUmwn4qO99exET6yLX65TlzoIavTuSCQL3vnh kORf5ddTpjNZ362y4fDw7qksffo3BsyBKFfVN54s9uGjvBMcRrpdWzuTr33pIAYgz+ZE r07g== X-Gm-Message-State: AOAM5316VJl/eILYjBoWPDwS9aVC7fmFD0FCiEVeOW7r6+yp+g1SIPu0 NOFRY7zUDdBlwoVIUHRgsDY= X-Google-Smtp-Source: ABdhPJwWuBVqvqiAa6SL5fPaQqllfHGw/SdK0Uc5+CN6wLMv/wwUKJbrSULom+MJXNBTgh1mRkzIPw== X-Received: by 2002:a05:6000:2aa:: with SMTP id l10mr42207978wry.518.1641281773701; Mon, 03 Jan 2022 23:36:13 -0800 (PST) Received: from ownia.. ([103.105.48.220]) by smtp.gmail.com with ESMTPSA id l12sm43064477wmq.2.2022.01.03.23.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 23:36:13 -0800 (PST) From: Weizhao Ouyang To: Sumit Semwal , Benjamin Gaignard , Liam Mark , Laura Abbott , Brian Starkey , John Stultz , christian.koenig@amd.com Subject: [PATCH] dma-buf: cma_heap: Fix mutex locking section Date: Tue, 4 Jan 2022 15:35:45 +0800 Message-Id: <20220104073545.124244-1-o451686892@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Wed, 05 Jan 2022 08:24:54 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linaro-mm-sig@lists.linaro.org, Weizhao Ouyang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix cma_heap_buffer mutex locking critical section to protect vmap_cnt and vaddr. Fixes: a5d2d29e24be ("dma-buf: heaps: Move heap-helper logic into the cma_heap implementation") Signed-off-by: Weizhao Ouyang --- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 0c05b79870f9..83f02bd51dda 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -124,10 +124,11 @@ static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, struct cma_heap_buffer *buffer = dmabuf->priv; struct dma_heap_attachment *a; + mutex_lock(&buffer->lock); + if (buffer->vmap_cnt) invalidate_kernel_vmap_range(buffer->vaddr, buffer->len); - mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { if (!a->mapped) continue; @@ -144,10 +145,11 @@ static int cma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf, struct cma_heap_buffer *buffer = dmabuf->priv; struct dma_heap_attachment *a; + mutex_lock(&buffer->lock); + if (buffer->vmap_cnt) flush_kernel_vmap_range(buffer->vaddr, buffer->len); - mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { if (!a->mapped) continue; -- 2.32.0