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: <ea11a25a-51cf-fbc8-bcd0-004ec47ff582@amd.com>
Date:   Fri, 11 Nov 2022 13:47:26 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.2.2
Subject: Re: [PATCH v1 1/6] dma-buf: Move dma_buf_mmap_internal() to dynamic
 locking specification
Content-Language: en-US
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
References: <20221110201349.351294-1-dmitry.osipenko@collabora.com>
 <20221110201349.351294-2-dmitry.osipenko@collabora.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20221110201349.351294-2-dmitry.osipenko@collabora.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TnhCeTdMc2FMZ1JCcWlSSkJjTlRKR3NKRkswMmFSUzB5OHVrTzI0ZzVPNXhM?=
 =?utf-8?B?ak96N1R6YStnY1FaS1RkektpSzVhbFg5bUtVbXZEbGM1ZHNrNHBWQ0ZoK2Zp?=
 =?utf-8?B?cXlzKytjSXFkUTF0Q04wSDU2V0orUG9LTjVNdzl4T3I4Q3hvQ0o0a0dCSnYz?=
 =?utf-8?B?cTJreVRpUWFETFFveW5LNVF0QkUzT0R3bld1NUlWQ3FVUXhGMzdGRCt0amhY?=
 =?utf-8?B?NU1zc2hGWExacGVsYlpieTRkWENjSWY0U0pKTWl4aFN5dFpDUkxiSXhQQ3BK?=
 =?utf-8?B?dTNKV2dUT3gvaDJZTVVDNXNLQVFEbXZhWUVCZDlmWHRDTGU1a1hSb2RBMUZG?=
 =?utf-8?B?b2NyM255WEJlNEJ5Unk0aHR6M2lGelV2Y05GUDJtUXVWQVI2OWI3WVA4MWhP?=
 =?utf-8?B?aDFMT3JsN0k4bE5Tc1ZuTkViUThpWEJiV1Y4bE5BTXNtcVNneEQrT2ZFTW55?=
 =?utf-8?B?YlZ3SGZ3bVZWNnFnREh5UlZnTGxtWjkyc0JiakRyNm1QUnVIU3dZL3M3dVBF?=
 =?utf-8?B?TjBCNmdodHZvSWgrRmNpUU04QjZ3NlNNd1JMQnIraTFtaWthZkpVZjJCVFBJ?=
 =?utf-8?B?ZDZmK0hOaVA4RTFvYmZYa09HTHZsSk5YRW0yb1FMMVV3WVRFUzVVczNzeGp0?=
 =?utf-8?B?eFExUjBIZmhCR0pCbXFNR1labG5vRkRUUGZnS3dDRWxrY29DdU9VaHd1T3VP?=
 =?utf-8?B?UUs4NEVXdmFpN0tJTFFEbnA4VHg1cEdEM0RVeDFDamhqM3VtOTljWlJvS3BW?=
 =?utf-8?B?NTd5b3FDWnpDS0I5dWpvSG55RXV6VlZwSGErZEVaQjJOUEUzbXZtMDJ3dHhs?=
 =?utf-8?B?ZHd6UjdDNmtrOGZ2S3hpWERIOEdoSjFOc2pxQy9XanRLUzJBQTl6MmZNdXYv?=
 =?utf-8?B?amk3ckh4Q2wzOWtoajlZOFJqellpWTZlaFd4Y3E3K2hkRGQ4aHpIWkM1a1Ir?=
 =?utf-8?B?TkRlMFRMd3BmY1ZPWC9GZ1gwekliWmYrMUtxbDVKQm5rV2JOUUl6UXd3ekhQ?=
 =?utf-8?B?WXpxRzh5V1p3eXo3Sll0Njd5eGEwM09iSFk3N0Qxa1NoSkM3b3c1RXd1UWd0?=
 =?utf-8?B?Q0NNdmFTQm1vQ1oxd3VyOEl4clZrbXRYKzNyK2FJME5lY3krV2I3S3VFTVpU?=
 =?utf-8?B?VUYxbGdKY3A2MGxUK245SFN0Q0hDSmh0UFJzSFJERmxtcmkra1hXMHBQRlJE?=
 =?utf-8?B?WTI5dDZJcUYxWDZPVGFWL3ZNQnFyMSt0aTgrWEVOa3JLOVZiR2xSZjlDWk5v?=
 =?utf-8?B?a0pUTlFHQW96c3RHb3VYTHhXR0YwblRjQ3dadUpnbFRsaklWWUtjSlVXMzJ4?=
 =?utf-8?B?ek9WNkR3K2t2Ym9mYndxM2hTYnUydzdSTmo0MzlFUFlFdzBiellrNzlZTWN0?=
 =?utf-8?B?dDZkNUpRUzI1cXpZaVR2RVZBV3VZZDV5QnVHTHFzbFBPeXcySElkcEZVL3B0?=
 =?utf-8?B?WE4wUWd1anlnRUhieE9ZSExMa2hibldPbm5OUDF2UGxSVlhINEhRK0wyY0JN?=
 =?utf-8?B?WTRua2lnOTM3YUhMMmlVWGFwNHVsYTZzVitWWFp4ZjlZeCtqNHYwbDQwVGk0?=
 =?utf-8?B?ZWlBaTNxcUNQbXorSVRDSFBjOTNkSGhqT29QU2t2RzVzeWRFUTVJRW1kc3dl?=
 =?utf-8?B?V251OWZ0Wmk2Q1lQRzByVDNDN2IrbmQxdjVEa0RDSEYrcVhLbGowVkZhY2F2?=
 =?utf-8?B?U0FaRGZFSFFNWFF6d2FQRHhWbGI4S204amlwdEJrb0xwVkNxZWRWNG1zYnhp?=
 =?utf-8?B?djQ4ZkFiSXdnQmlRVi9CdVRTUWRwdkhwaHIwNHhISVNtWWtvM3F0TzlheGsz?=
 =?utf-8?B?SDJ2Nk9jZUZWak95cm1wUkJxNUwzU0wzVjdSd3JEOGpEaEdBb29uaUQ4bmwz?=
 =?utf-8?B?ZVpDSUUzKy9wZVdzUmVCbzRiYzZKQzBOZVNtYzFjNFRpRHVUTFJ0ZXpJMk1j?=
 =?utf-8?B?VWNHLyt4YzVGc3lldE1CUEJXV1MwZXFXMERFenNkb0FvMWVxOEJmaUYzUjEw?=
 =?utf-8?B?QURJRXFReUNSK0Y3cURaMDZnVFFCOWJIcThXcUR3N1RuVjZseXpVdnVrYWhs?=
 =?utf-8?B?cTFCcGhhNk1ScHI0UFNMQ1hGMjVwSjV5QjdJd2xaMHkxWDArd3o1ellVRURE?=
 =?utf-8?B?VHFjSDNVM1JmdFMxSlFrbm9rcmpKaERPdENzdUczQXpndytVTG1ZMUJuRWJP?=
 =?utf-8?Q?MPcLhqYbqPcewTTcAh5Hkm7qPbL9eMIyXZ/YdVEPqCON?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f89c8762-41b6-4bc3-f266-08dac3e2eaec
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 12:47:40.4643
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4Lcrb/9myqqM+nDq2DY5EPNWQbX1d3ePsRW/zGwcyIpIw7VZvzKozkyUn02f43xl
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4199
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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)