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: <01f62e6c-a40b-42e4-6cb0-338bd268b0a5@amd.com>
Date:   Thu, 27 Oct 2022 08:13:38 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v1 1/2] dma-buf: Make locking consistent in
 dma_buf_detach()
Content-Language: en-US
To:     Dmitry Osipenko <dmitry.osipenko@collabora.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Sumit Semwal <sumit.semwal@linaro.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, noralf@tronnes.org,
        Dan Carpenter <dan.carpenter@oracle.com>
Cc:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20221026224640.7542-1-dmitry.osipenko@collabora.com>
 <20221026224640.7542-2-dmitry.osipenko@collabora.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20221026224640.7542-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?TEtnMVh4SXVlU0F3NzR1QlliYnVxOW5laGZQR1FMK3g1azY1T0ZPV25KODNU?=
 =?utf-8?B?NUU2N2lQMU5qTmRDd3ROS1JOTEpoM09aMWJ5TWRBWW5GNjVTNFp1V2ZLZWdJ?=
 =?utf-8?B?MjB5bk5WNDNMZmV6OWRQVjdOclpNcFRqejNxZkJna0ZjbUt1QnN5OGxzUkh4?=
 =?utf-8?B?VmttTi9ld3FJR3NMdmVRQlBHeTZTbmxQc1Rla2ppVVVUTm9tNHZRZmw0NGRN?=
 =?utf-8?B?YkZYY3JrYkhrMXNSZnI4NzlCTGdwalFMb2kzYWFRdUpEcjdOeGEvQkdnditr?=
 =?utf-8?B?M010Z29sMUFiUXRmbVJRVHFleWQ0cXYySnYzWWNlclhwTmE0R2lCQ1V1VE5K?=
 =?utf-8?B?b2lKLzRRTEMwbTRCNnhzaGt3WTVsZ0g4Mml3blJhQ0Y0VEJsUjlUK0pRbGtE?=
 =?utf-8?B?eGxNcmZpZXpzRjFXTGFCdUE1RElUMCtBZ1dCdzI5cWVDOGJSNytVeDlORklq?=
 =?utf-8?B?dDdIcG8vM1hsVDFCbWNWUVhRUk5UbHQ1RzRFb2FEdkd0aWVNQlhHdW5ZcFNB?=
 =?utf-8?B?eW1MelZYSzhzcCtsRTJPY3hDREFieFJKck1HYm1VSVF5MWI4cXdjcHNJRjdy?=
 =?utf-8?B?WjA5ZG1Hd0VIUjdiSHF5bHFrektVSWl3a0V3cjNpNnI5OUVBNnJRZFppR2FV?=
 =?utf-8?B?VVViL0NQWTlaZ2pDVmgwMWpxc1o5UDIyQVFHMkhFSmpWWXhLakxuSU1PZ1VX?=
 =?utf-8?B?YUZ1UUdOcmV3b1ZyalM3bjUvQ0xaOHlOZlFaalFPYmdQVGtYdEp2WksyQkR6?=
 =?utf-8?B?MUg1ZHhLVFFleHJtYzZna1Y2SHlPODAvTDB1SXd4VHlodmRRdFg5emhUSGNy?=
 =?utf-8?B?aHZCenI0NThBQXJuZnV5eTYvZ1FNOEtyMnpjY1RMQjJLWWRTUVE5VmYrS2RR?=
 =?utf-8?B?a21qSmpVVStoM05jcjJxamNpNkg5RkVKaWhSR2Vucng2WEUwdnI3VTVLakRn?=
 =?utf-8?B?WFNwMy93M3lZSmRoRVc3eXEyQ2N4alhFSnNiaUtPaVJCQ2xvMVhkVmZmRnZj?=
 =?utf-8?B?aW9INExZb2lRS3dmQXpIL0Q0YlJ6dDA2KzZsNkRBaHJHMGZLR0kvK2RPd0d1?=
 =?utf-8?B?R2hGa2daREF4T3hEY3laNjFIK1p4eElzeUk4N3pxaWovNWp3RFN1OXhQaS9F?=
 =?utf-8?B?cTJNN2czc0JEK0IwM1gxYWhJak90TmJpeG0zOCtES1Rnc0NVdUJqK3RWSTc5?=
 =?utf-8?B?VzQrSUtieWVoam1oSlJJYVJxZWVZNTNoU1BDaDkvS2t2N2EzU2o5U1ZRMGkv?=
 =?utf-8?B?NzA4VnJuL1pKaXhyY2pkaWI3TE5jdlZ3WFZSNE9aUnZha1FubC85elFmRjVS?=
 =?utf-8?B?Mnd1cjB6TlZXN3BaOGZxQmpNeFlvVWZCdC9FaW1GQVlmdGZvNnp2WC9BV3lT?=
 =?utf-8?B?RCtiVlh2MEN2cTRLY3JOSTNMdU9RcEo3VE95cFoxUWs3NzI2ODIvTlV2d0d1?=
 =?utf-8?B?YTJCYmlyU21ObTFZNFZEMDJXZk5KOSszOVRLVXplQnVTYTczbnh3SVluUEZm?=
 =?utf-8?B?bmZoV1JWSDE0MlEvcm9Mb3pBMERDNWxpMnJiZDVaN2EwM1hNaTEwSVpIQ2hl?=
 =?utf-8?B?M2JwVTNFd2NYWDFYdTJiOGcweGRPWHltSWY3bTBVa29USi9YNUxmcUgzdFYw?=
 =?utf-8?B?czhzcVljeVNMZDlCRGROMU5aa29OTTJlQ0YxaHF0SDJQZ0M2SmswbHpob3d3?=
 =?utf-8?B?dmVpdWhwVmNiajFvd2pWNWNPSWh2cVdqTUJlRG5OVHMxZ3NzY0xmZE04NUNL?=
 =?utf-8?B?SUpmbFg1czVnNXV5R2laNlBBS3hBdnd2Ri9PblNFdENhWXM4SHA0OUtTYzMr?=
 =?utf-8?B?UnlsaGtNQVJDeG01UlFacDlYd3NYOE0xRGh4UE9RUncxRyt6ZVN4NEJWK2NV?=
 =?utf-8?B?dE5kaXFUQzJ2WUFOWXBnNW1CMGJ6b0tXb0VuemFQZERQemJKRk1TV3p6MVF3?=
 =?utf-8?B?MkMyYVFTZGJXd0ZHTnpvWGdCQlExZkJJMTRUYXY0UnZaQUt1cDRNYm9QcGFW?=
 =?utf-8?B?ajhIYUpQeHdtMEZEU3h5WnhRVkNrQmd2Y2lXdGtWeHBkczNPNWxFbVFxd2lw?=
 =?utf-8?B?SjlqWHo3TUxlUHJGNFRXYm9sMlNNTEwxTDlkYmNkOEVWQ00zV04yOG9GYkJ0?=
 =?utf-8?Q?Vop6BDNQ/GC4DYtLid/wuK94P?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 125caf6a-8b3b-4c13-a5c2-08dab7e26b8e
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 06:13:52.3848
 (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: ps/CfkWuPtnVmbvKvzj9L7LXHHTbPmUvCcn4QIswJV1ZuD0fXcjBQnMwRTnwb5AT
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5305
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 27.10.22 um 00:46 schrieb Dmitry Osipenko:
> The dma_buf_detach() locks attach->dmabuf->resv and then unlocks
> dmabuf->resv, which could be a two different locks from a static
> code checker perspective. In particular this triggers Smatch to
> report the "double unlock" error. Make the locking pointers consistent.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Link: https://lore.kernel.org/dri-devel/Y1fLfsccW3AS%2Fo+%2F@kili/
> Fixes: 809d9c72c2f8 ("dma-buf: Move dma_buf_attach() to dynamic locking specification")
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

It would be even cleaner if we completely drop the dmabuf parameter for 
the function and just use the inside the attachment.

Anyway patch is Reviewed-by: Christian König <christian.koenig@amd.com> 
for now, wider cleanups can come later on.

Regards,
Christian.

> ---
>   drivers/dma-buf/dma-buf.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index c40d72d318fd..6e33ef4fde34 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -998,9 +998,10 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach)
>   	if (WARN_ON(!dmabuf || !attach))
>   		return;
>   
> -	dma_resv_lock(attach->dmabuf->resv, NULL);
> +	dma_resv_lock(dmabuf->resv, NULL);
>   
>   	if (attach->sgt) {
> +		WARN_ON(dmabuf != attach->dmabuf);
>   
>   		__unmap_dma_buf(attach, attach->sgt, attach->dir);
>