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: <e760f555-7f2d-dea9-70b2-c0881adc3afc@amd.com>
Date:   Wed, 10 Aug 2022 08:52:18 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v8 1/2] drm/gem: Properly annotate WW context on
 drm_gem_lock_reservations() error
Content-Language: en-US
To:     Dmitry Osipenko <dmitry.osipenko@collabora.com>,
        David Airlie <airlied@linux.ie>,
        Gerd Hoffmann <kraxel@redhat.com>,
        Gurchetan Singh <gurchetansingh@chromium.org>,
        Chia-I Wu <olvaffe@gmail.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Emil Velikov <emil.l.velikov@gmail.com>,
        =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= <thomas_os@shipmail.org>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Dmitry Osipenko <digetx@gmail.com>,
        linux-tegra@vger.kernel.org, kernel@collabora.com,
        virtualization@lists.linux-foundation.org
References: <20220701090240.1896131-1-dmitry.osipenko@collabora.com>
 <20220701090240.1896131-2-dmitry.osipenko@collabora.com>
 <a42237c9-6304-4b06-cede-2175c7e7b87d@amd.com>
 <YvKO5r5Sr56e9vBf@phenom.ffwll.local>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <YvKO5r5Sr56e9vBf@phenom.ffwll.local>
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?K3NMNmFsbkZFdlQyTHhZNXpncGlCZFRtRFUyWlJaaW8reUgxZ1hYZERBS1Y0?=
 =?utf-8?B?QkF2d09kVTZZbk9HdVlleVhtNzZ4VEc3cmlZRmpPSWpibUR4bzZlL3hRdzFy?=
 =?utf-8?B?R2RKNTdUS0ZtZWZZVDNTYTNaUkxmK1dRV1UyY2RwQmNvVnF5WjZDcXVLdDJX?=
 =?utf-8?B?dGhSdGpIUjJGTmRmdStrRFBLaTdzYnBzYTNLNG1RV2RTeUpSNWF4TGJOSHpE?=
 =?utf-8?B?OHZSZjdUQ3FrZzlka0I5eGZqT0JRWEJXbXFqbTMzWm1aYjlHWnUzR0E0TWNj?=
 =?utf-8?B?K3haZ25OUnJOeVJuNlpWT3A4dW4vakVZdVdiZlZQRlBiUUVZZlB1amcwWlZu?=
 =?utf-8?B?Q3lQenNGNHFBcDJiS1dVS2ZGNURwOFlmK2s2K2wxcDd3NDRrN1haTEt1clZj?=
 =?utf-8?B?ZWMyNHI4bVVIa2hYMGJjOEFBK0VmR2I4ait3WDlzQVRSclhLWkFrTWUxRHVY?=
 =?utf-8?B?cDg0YzRTU0dwdXJXaStwYVMvVmRHNDN0Y3NuNFpQMllnRklld2hCL0tKUkpm?=
 =?utf-8?B?akdxQnZpK0t1azhzSmI1SUFTbDQySWV0UzdDUmJvRkZsQ0RaVlR6bk1IaHdE?=
 =?utf-8?B?amZmemFnMDJZa000KzhqWmNEdlF2Wm9yc2svaHR6TUk2ODlHalJ0d1hReVBx?=
 =?utf-8?B?SjlWWE1sUFYveDY0SmxPN2pSN3NuQUlzdkZIUERsa1VOV2RlMVRWQXVJWDlG?=
 =?utf-8?B?V2lkajZjN3gvVnR2bk4vSitPMHRDdHV4eG1SMkxsT2U1RE91ZThNYUJVelVT?=
 =?utf-8?B?ei9FamdYTGR5YVVpeGRFOEZOSEVrMnJjekdRdk9mS2FpSG5wU0Yxb29UdWYy?=
 =?utf-8?B?RDA2bjhncWxZakJvRi9FTkc4WmVFWTlQQmFSa1p0aXJxV3JFZHlhUXpSUElL?=
 =?utf-8?B?ZS9QQ044dWJCNkttZXFsaUszelFhQ1E4MmdjSSt4bFN1YzhtUG5nK3NFaWQy?=
 =?utf-8?B?bU5KYkc3dmV4Y2V5dmV4V2gvQnJ4aXNTNm12cmh0dW5qOWk4TlQ0dk9TbjlY?=
 =?utf-8?B?UGxzbW9KOWFSVnVvL29sK2pmWVY4cWZLQkZMQjl2MHJ3TDNxZFhrQVhWVCt6?=
 =?utf-8?B?dXByaFNnRzQrbUMyd3BTTVZpeXR6MDErc2VnNkRUcTZRRGEvZDQ5NU9sVDNW?=
 =?utf-8?B?eGZNVGE0THc4UFpKRStkVk9UcFBrVlFKT09JNUV5d1JaQTlYOXhNd1hyaGVR?=
 =?utf-8?B?cldTNUFlckFZRVhoN1FHRXk1ZzA4RHB6cGYzRy9MQ3BXajIvdHo4M0lNU2VK?=
 =?utf-8?B?WkVSUmRWRGR4ck4yVFJzVGxuUVVaTTVhK3NJeWtBQVhWdk5NL1pLUDkyTWpm?=
 =?utf-8?B?RTNZMnBGc21QVVBzVHgyQWZQRTFvazljU2FzY0JNUXR5Z0tUVGJ1U2ZhMVd4?=
 =?utf-8?B?Mk1SQ1RRZldJRzIrRFdOYTNCTWNuQ3hScHhFNjlsODVNWnRSQUhtQ3N6ZTg5?=
 =?utf-8?B?YW0yZmZ0NGJxMDRtc0JLVi9UTWFPZFh4VmVneUg3b3p5Q2huN0JXZUoyemE5?=
 =?utf-8?B?USsrSUlIcTQ4bTE1NW1FZktZUTNBeUdkTGlHN2VqK3FYa1NBSXR2M1gwakRS?=
 =?utf-8?B?VER2THBBUm9mTXg2UGhlN0dod2RTb3VhVjRRMDlKd0I1UW5FTkpUbWJtN21G?=
 =?utf-8?B?dWNxa1dtZFpRS2pVMXlkVS9KYTIxaDlTbVpFZFFkQXZtVktHWEhIL2VONDZY?=
 =?utf-8?B?bWpNMWZNTUxaRERjcTJsc1hoeDZpcGNqNmo4cTl2aUdyWlRiWElJalE3MDYx?=
 =?utf-8?B?U2hnSGZpM3ZlQnFiQVIvSmZDQlg3Mms1eExKN0g4ZitEN2QyQzdwMlBsajhQ?=
 =?utf-8?B?WnJJNHYwTEtSekFScjZlYXhSNXFnOTdXT1lLVnBqMFdkZWx6anhZQlRlOFYz?=
 =?utf-8?B?Z2k4ZnB1NVQ4NFZ6Zk5rdXA1d1VZM3hSa2Erc1QwamhMdUdVZ2t4bWQ3N01T?=
 =?utf-8?B?aHJaMkoyUS9lVXBhNGl2Z01lRUhkbHFCcStrR1RIQWNWeVF2eVFkVDVrc1JX?=
 =?utf-8?B?c2M0c202cWVLVlo4clB6UXhIdHIwVTRNam05VzNzcVFmenp6MEh5ZHBsOEFB?=
 =?utf-8?B?SjRwTmw1aWZBcWIxSjF0RFA5REtBWkc2T3ozSFZxeGptS0xCYm5rYmJWYnNE?=
 =?utf-8?B?eVdaZlNRZlJ1RlhXZlp3SmhRZGlTVXZScDJRaG1sRzhuVlZMWWphQi9ub1Jj?=
 =?utf-8?Q?9tJDP2bJPRl9DIJj4HHi9eJS6lupkcMETVHOl/yg8QhY?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6119e70-e45d-4947-d7b7-08da7a9ce1bb
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2022 06:52:24.8736
 (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: zPQfi2SrtaNnq8J4QOt8liYR2AEh789K8KUUK+Ml7Kt9S80rSSXQIu+Wd0LfVgPO
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3949
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,T_SCC_BODY_TEXT_LINE
        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 09.08.22 um 18:44 schrieb Daniel Vetter:
> On Tue, Jul 05, 2022 at 01:33:51PM +0200, Christian König wrote:
>> Am 01.07.22 um 11:02 schrieb Dmitry Osipenko:
>>> Use ww_acquire_fini() in the error code paths. Otherwise lockdep
>>> thinks that lock is held when lock's memory is freed after the
>>> drm_gem_lock_reservations() error. The ww_acquire_context needs to be
>>> annotated as "released", which fixes the noisy "WARNING: held lock freed!"
>>> splat of VirtIO-GPU driver with CONFIG_DEBUG_MUTEXES=y and enabled lockdep.
>>>
>>> Cc: stable@vger.kernel.org
>>> Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.")
>>> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
>>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
> Also added this r-b tag when merging to drm-misc-next-fixes.

IIRC I've already pushed this to drm-misc-fixes with a CC stable tag 
about 2 weeks ago.

Please double check, it probably just hasn't come down the stream again yet.

Christian.

> -Daniel
>
>>> ---
>>>    drivers/gpu/drm/drm_gem.c | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
>>> index eb0c2d041f13..86d670c71286 100644
>>> --- a/drivers/gpu/drm/drm_gem.c
>>> +++ b/drivers/gpu/drm/drm_gem.c
>>> @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
>>>    		ret = dma_resv_lock_slow_interruptible(obj->resv,
>>>    								 acquire_ctx);
>>>    		if (ret) {
>>> -			ww_acquire_done(acquire_ctx);
>>> +			ww_acquire_fini(acquire_ctx);
>>>    			return ret;
>>>    		}
>>>    	}
>>> @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
>>>    				goto retry;
>>>    			}
>>> -			ww_acquire_done(acquire_ctx);
>>> +			ww_acquire_fini(acquire_ctx);
>>>    			return ret;
>>>    		}
>>>    	}