From: "Christian König" <christian.koenig@amd.com>
To: Dmitry Osipenko <dmitry.osipenko@collabora.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Liam Mark <lmark@codeaurora.org>,
Brian Starkey <Brian.Starkey@arm.com>,
John Stultz <jstultz@google.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Daniel Vetter <daniel@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Tomi Valkeinen <tomba@kernel.org>,
Thierry Reding <thierry.reding@gmail.com>,
Tomasz Figa <tfiga@chromium.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Amol Maheshwari <amahesh@qti.qualcomm.com>
Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org,
linux-tegra@vger.kernel.org, linux-arm-msm@vger.kernel.org,
kernel@collabora.com
Subject: Re: [PATCH v1 1/6] dma-buf: Move dma_buf_mmap_internal() to dynamic locking specification
Date: Fri, 11 Nov 2022 13:47:26 +0100 [thread overview]
Message-ID: <ea11a25a-51cf-fbc8-bcd0-004ec47ff582@amd.com> (raw)
In-Reply-To: <20221110201349.351294-2-dmitry.osipenko@collabora.com>
Am 10.11.22 um 21:13 schrieb Dmitry Osipenko:
> All dma-buf functions has been moved to dynamic locking specification
> The dma_buf_mmap_internal() was missed out by accident. Take reservation
> lock around file mapping operation to adhere the common locking convention.
>
> Reported-by: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Christian König <christian.koenig@amd.com> for this patch here.
Acked-by: Christian König <christian.koenig@amd.com> for the rest of the
series.
Regards,
Christian.
> ---
> drivers/dma-buf/dma-buf.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index 13bfd2d09c56..b809513b03fe 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -129,6 +129,7 @@ static struct file_system_type dma_buf_fs_type = {
> static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)
> {
> struct dma_buf *dmabuf;
> + int ret;
>
> if (!is_dma_buf_file(file))
> return -EINVAL;
> @@ -144,7 +145,11 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)
> dmabuf->size >> PAGE_SHIFT)
> return -EINVAL;
>
> - return dmabuf->ops->mmap(dmabuf, vma);
> + dma_resv_lock(dmabuf->resv, NULL);
> + ret = dmabuf->ops->mmap(dmabuf, vma);
> + dma_resv_unlock(dmabuf->resv);
> +
> + return ret;
> }
>
> static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence)
next prev parent reply other threads:[~2022-11-11 12:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 20:13 [PATCH v1 0/6] Move dma_buf_mmap_internal() to dynamic locking specification Dmitry Osipenko
2022-11-10 20:13 ` [PATCH v1 1/6] dma-buf: " Dmitry Osipenko
2022-11-11 12:47 ` Christian König [this message]
2022-11-10 20:13 ` [PATCH v1 2/6] drm: Assert held reservation lock for dma-buf mmapping Dmitry Osipenko
2022-11-10 20:13 ` [PATCH v1 3/6] udmabuf: " Dmitry Osipenko
2022-11-10 20:13 ` [PATCH v1 4/6] dma-buf/heaps: " Dmitry Osipenko
2022-11-10 20:13 ` [PATCH v1 5/6] media: videobuf2: " Dmitry Osipenko
2022-11-11 3:39 ` Tomasz Figa
2022-11-10 20:13 ` [PATCH v1 6/6] fastrpc: " Dmitry Osipenko
2022-11-11 20:59 ` [PATCH v1 0/6] Move dma_buf_mmap_internal() to dynamic locking specification Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea11a25a-51cf-fbc8-bcd0-004ec47ff582@amd.com \
--to=christian.koenig@amd.com \
--cc=Brian.Starkey@arm.com \
--cc=amahesh@qti.qualcomm.com \
--cc=benjamin.gaignard@collabora.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jstultz@google.com \
--cc=kernel@collabora.com \
--cc=kraxel@redhat.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lmark@codeaurora.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=sumit.semwal@linaro.org \
--cc=tfiga@chromium.org \
--cc=thierry.reding@gmail.com \
--cc=tomba@kernel.org \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox