Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <24aaf108-0168-4a5c-57bb-cf24daefb990@linaro.org>
Date:   Fri, 25 Nov 2022 06:58:34 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [PATCH 01/11] misc: fastrpc: Assert held reservation lock for
 dma-buf mmapping
To:     Dmitry Osipenko <dmitry.osipenko@collabora.com>,
        gregkh@linuxfoundation.org,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
Cc:     linux-kernel@vger.kernel.org, Daniel Vetter <daniel@ffwll.ch>
References: <20221124175125.418702-1-srinivas.kandagatla@linaro.org>
 <20221124175125.418702-2-srinivas.kandagatla@linaro.org>
 <a30bec0c-7471-a144-9a69-f59d952b8970@collabora.com>
Content-Language: en-US
From:   Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
In-Reply-To: <a30bec0c-7471-a144-9a69-f59d952b8970@collabora.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 24/11/2022 18:03, Dmitry Osipenko wrote:
> On 11/24/22 20:51, Srinivas Kandagatla wrote:
>> From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>>
>> When userspace mmaps dma-buf's fd, the dma-buf reservation lock must be
>> held. Add locking sanity check to the dma-buf mmaping callback to ensure
>> that the locking assumption won't regress in the future.
>>
>> Suggested-by: Daniel Vetter <daniel@ffwll.ch>
>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>> ---
>>   drivers/misc/fastrpc.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
>> index 80811e852d8f..c6b9ddaa698b 100644
>> --- a/drivers/misc/fastrpc.c
>> +++ b/drivers/misc/fastrpc.c
>> @@ -6,6 +6,7 @@
>>   #include <linux/device.h>
>>   #include <linux/dma-buf.h>
>>   #include <linux/dma-mapping.h>
>> +#include <linux/dma-resv.h>
>>   #include <linux/idr.h>
>>   #include <linux/list.h>
>>   #include <linux/miscdevice.h>
>> @@ -692,6 +693,8 @@ static int fastrpc_mmap(struct dma_buf *dmabuf,
>>   	struct fastrpc_buf *buf = dmabuf->priv;
>>   	size_t size = vma->vm_end - vma->vm_start;
>>   
>> +	dma_resv_assert_held(dmabuf->resv);
>> +
>>   	return dma_mmap_coherent(buf->dev, vma, buf->virt,
>>   				 FASTRPC_PHYS(buf->phys), size);
>>   }
> 
> This patch was already applied to DRM tree together with the rest of
> prerequisite dma-buf patches. IOW, it shouldn't be applied separately
> via the misc tree.
thanks, that is true.


---srini

>