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: <b7d8956e-5ac6-8200-d8b1-4ce828f04665@amd.com>
Date:   Mon, 25 Apr 2022 11:42:37 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] gpu: drm: remove redundant dma_fence_put() when
 drm_sched_job_add_dependency() fails
Content-Language: en-US
To:     Hangyu Hua <hbh25y@gmail.com>, yuq825@gmail.com, airlied@linux.ie,
        daniel@ffwll.ch
Cc:     dri-devel@lists.freedesktop.org, lima@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20220425083645.25922-1-hbh25y@gmail.com>
From:   Andrey Grodzovsky <andrey.grodzovsky@amd.com>
In-Reply-To: <20220425083645.25922-1-hbh25y@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bjFwV1d1Ky9zamtiQXpreW54Nlh2RVRWUmFiOEFEUFFuL0RqQk1remhkTE8v?=
 =?utf-8?B?NVVsMGpSU2NMdElCZ0gzYm02eVhJSUlvUUtORXBpTU0zZHFHTi84TGZpVE5I?=
 =?utf-8?B?WTVQem5rUjhMWTBhMWQyY1hrc1B0aHNhQ0d1SHdPZzVxd3pLTW5QMlZ4bC9w?=
 =?utf-8?B?bmRSU2VRNFJSQk8yNlNKZGVhNERTK2J3TDlCa1RwSFE0N2JMTHRiUnZUNE5K?=
 =?utf-8?B?U21LUEtaclhiYzRLUDFJUktEaVdyUC9UZzF6SkFuZUtmOFFkK3h3Y2dKRkgr?=
 =?utf-8?B?ZG5CTURSdFFuRUpKS1VHMGVXcUx6b2dXZ0xyYXRuaUNLYk11Rm8xZGVUNTVr?=
 =?utf-8?B?dnV6dzNkRW15UGNmZmdnbWFRaDR5aTNxU1plQ1hya2RadDRXRUk5b1R0UExX?=
 =?utf-8?B?UlcxR1YyRkVxanMyWlB4eERxamtoZ0Uvek9NME1EOEhSLzZBQlNDd0U5azht?=
 =?utf-8?B?NmRNa0xMY1VWalZvV3R6dTRRTE9VM1ZZa3ZCcjdZOHgvQldla242Qm5VckVF?=
 =?utf-8?B?K3JyWVh1N0VvaTRGUGdlRjhZNHVMVk5OTjF0ZGlPQ3lKQzI1N2dtY3BwZ1pM?=
 =?utf-8?B?SmtPWkk5UDRUajZWM3lvazJNaTJpOE5EaTJiU1hJK3p4U1h4Vmg5d3ovV0lX?=
 =?utf-8?B?eXRIUm56THNLdXZmSUNjRVVnSi9NRjFjbitLRGVTVUJ6RHI3RmcvZjVaVHRV?=
 =?utf-8?B?aG44LzBPVUNEdUZjQm5lYzl0YXNPUVhjNEFCZHF2Z3lJSG1Pamp5ZVZVS053?=
 =?utf-8?B?M21jVHBSL2l4UDQ4SVBZRVRFeW1VSEFlS1ZWZ2NOT21PYVJwTlJtV29RSHAy?=
 =?utf-8?B?K2JDVDB0dEJoTW9BVkFGZG5JR0N6d3J5MDR5OFZnQWg3QWtWM1JoS0hvaFJV?=
 =?utf-8?B?SkdGU2JUR2xSZUk2RlFYOHRBN1NTNWJqNmlVdkM0NjJabU9lbzNaZGtKUXZE?=
 =?utf-8?B?aDNSbUk4REkrMStYRTk1TkVGUEEwYXZRQkJMS1NzQ0RFOGo3SnY4ampTdng3?=
 =?utf-8?B?ZnNkZmMvQmZ5MksyMlh4ZkdpSUZlRTRqNEZrR1RGd21CcEFqTzNCdWk2THcz?=
 =?utf-8?B?amlRanREWkt0RVk4cytHNDRYZm45OFdsWEtBc05DZDhWUUxLWGpkLzcvTnpY?=
 =?utf-8?B?RVN3SEZ1R3RyRWh3OEJSYk96Z000MWZnenRIMmJUb1NmVEFldlZub2EyVTNE?=
 =?utf-8?B?UjNLNnJvRXZkQmlkQmZ6ekQrRWl5RTlNb2R0bTgyQStVVEJwcW50S29Scjd5?=
 =?utf-8?B?TklONnhFVDZZbnZmbDZhVTRFWUVaSFFuYVFJRkE3cE9hbk5xb2IzUDBTWHhu?=
 =?utf-8?B?RjM0UjgyaFYzcjRoMlh3OU5aNVJkUlZnN01Pam02S2l6WkxPQnAwbDRFN0dr?=
 =?utf-8?B?VEc3OHgrSjk3ajRwZzNTajZxS1RrVVgzWFloeXFwdGRxTlFzUkNIOVgySWRO?=
 =?utf-8?B?U2lrMGg0R3pRMXo3NjdwUFpXY0YxbUpubkFJa21mRDdaZ2dyeFFVMVR1QnR0?=
 =?utf-8?B?NTdqTXM1c24rQTBNNnJvV1F2emxkT0p2YldjUmd4MHllUWpuazhkMHJ5MmRR?=
 =?utf-8?B?RkNHdDlvKzdkNGdkcVR5dnljUmdNNUJ1M2pFWkltdW1OQnhJK1ZhWGYwc0hq?=
 =?utf-8?B?bVpydmgzMjBZMzlvSnhxa1k2eW1MUmJtdUg4OWZmRURrYjVRU2RVaDRBWjk4?=
 =?utf-8?B?YU9SNTdQMnNKQm5NaTVuQmtUeTRjWmxMQzRQVjlpZWxQUkdIb09Ha1NVVDZ5?=
 =?utf-8?B?akJ5aG1VT1N1dWgvajQ0OXdJZzZObHF5RWNYL3ltU0t3OHNYZnExK3pLbEtL?=
 =?utf-8?B?M3RxNmoxZm5id1ZFZnpiUndPUE5nbWR0UE5qakZpdmNKNTUxYmRpZlVsSFdl?=
 =?utf-8?B?OGNVR1BBNjFRRlMzV2RCNE56a0VMNmJEejd4SUl0NVpkT3Q0N0ExOG52S3pE?=
 =?utf-8?B?RWM0OFJVN0RIYmNDSjZPVHN3TjFSMUVxbDdLakxOYjZ5a0Q1TytSSkRUY0VR?=
 =?utf-8?B?R21FdGtiNXFPOXdtSU9WSFMrOXZIN0IweCtSUmNLUll6aW54MmluYW5odXF2?=
 =?utf-8?B?ODZXUmFqN2pwQXpLWnRpaHpmOUlOalpBRGs1MTUzbUp5UHY5Wjc2NTBqY1VI?=
 =?utf-8?B?VGxsUlozZVlWaFpSM1dHdm5WMEZjanE3eGE5OHVFL2YzYnFPMEdCWk5YVjBj?=
 =?utf-8?B?eW8vZ0prbVdJc2NUTzFjazVkNS9wbUFkNGVscmx3STFtd1dvMlZtNjNEbFBu?=
 =?utf-8?B?ZjBGK1VTTFBaZEx4WEp2U3ptZFNxUkpJVjBEQVg1TWFGeGlQMEFTMEFXWG9l?=
 =?utf-8?B?LzZGK1ZjL2d0Nks0eXp3YVNzWnViTjJSenpScHZtWkkreUVUQ3pNdGxUYVcr?=
 =?utf-8?Q?ItygUpeABTcsTZPy2kXDqFar7Rq0HkhieiNC25WyS1WmD?=
X-MS-Exchange-AntiSpam-MessageData-1: lqgutPOuBOlKUQ==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0bf588f0-ea32-4bbc-ef7c-08da26d23b34
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1947.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2022 15:42:40.8408
 (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: LD8Q1EIBFgxTy8WCwOkwW/Tg8fat5GBQHSRahf8rCSFHxdQbn6E+hJ6NkhGgWWobgBoIYOYbQhS3NbDywZNFTQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5500
X-Spam-Status: No, score=-4.0 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

On 2022-04-25 04:36, Hangyu Hua wrote:

> When drm_sched_job_add_dependency() fails, dma_fence_put() will be called
> internally. Calling it again after drm_sched_job_add_dependency() finishes
> may result in a dangling pointer.
>
> Fix this by removing redundant dma_fence_put().
>
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
> ---
>   drivers/gpu/drm/lima/lima_gem.c        | 1 -
>   drivers/gpu/drm/scheduler/sched_main.c | 1 -
>   2 files changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
> index 55bb1ec3c4f7..99c8e7f6bb1c 100644
> --- a/drivers/gpu/drm/lima/lima_gem.c
> +++ b/drivers/gpu/drm/lima/lima_gem.c
> @@ -291,7 +291,6 @@ static int lima_gem_add_deps(struct drm_file *file, struct lima_submit *submit)
>   
>   		err = drm_sched_job_add_dependency(&submit->task->base, fence);
>   		if (err) {
> -			dma_fence_put(fence);
>   			return err;


Makes sense here


>   		}
>   	}
> diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
> index b81fceb0b8a2..ebab9eca37a8 100644
> --- a/drivers/gpu/drm/scheduler/sched_main.c
> +++ b/drivers/gpu/drm/scheduler/sched_main.c
> @@ -708,7 +708,6 @@ int drm_sched_job_add_implicit_dependencies(struct drm_sched_job *job,
>   		dma_fence_get(fence);
>   		ret = drm_sched_job_add_dependency(job, fence);
>   		if (ret) {
> -			dma_fence_put(fence);


Not sure about this one since if you look at the relevant commits -
'drm/scheduler: fix drm_sched_job_add_implicit_dependencies' and
'drm/scheduler: fix drm_sched_job_add_implicit_dependencies harder'
You will see that the dma_fence_put here balances the extra dma_fence_get
above

Andrey


>   			return ret;
>   		}
>   	}