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: <9e288f3c-3251-f017-3541-d01ae6afe499@amd.com>
Date:   Mon, 28 Feb 2022 16:21:45 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH] drm/v3d: centralize error handling when init scheduler
 fails
Content-Language: en-US
To:     Melissa Wen <mwen@igalia.com>, emma@anholt.net, airlied@linux.ie,
        daniel@ffwll.ch
Cc:     Jiawei.Gu@amd.com, christian.koenig@amd.com,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20220228181647.3794298-1-mwen@igalia.com>
From:   Andrey Grodzovsky <andrey.grodzovsky@amd.com>
In-Reply-To: <20220228181647.3794298-1-mwen@igalia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bzgwazYzOVR6OWJoajA0RXZ1eU5aY0tpSFBCZElxcld1RWJlYTNpeWprbHNk?=
 =?utf-8?B?cXRiSktmWEJuRG5zRVd1N3RXWWY5eWxyV01DaGlaMlVadDZ2bjBlcnpoenVR?=
 =?utf-8?B?YmVNdERwUkRzNC81cXpDd3htQjYwVk1yU0JhM0FtTVBxWjIvWitVdFQva1NT?=
 =?utf-8?B?bG5GZWd4NnQ5VzNGcWYxVm9wZnZyeC9KNnJ5c3ZvTk8yM0pOMDNaOTVBRGR2?=
 =?utf-8?B?RU1WbFpQY0NSTGxZUkVidmV4MEdmbmUwa1VUSWhSeXR4Q2FrZEV0Nmsyd2Rn?=
 =?utf-8?B?d1F6V0d1K21sL0R4RlZ5SW1mTTFidTFlVm9zdWIwa1Rnd3NScExwaGJsYS9H?=
 =?utf-8?B?TjdxMlkxb2U0M3pVUVljZXZWYXJUSEwzSmtEcEdaR043ZGozcmx1WTlJcHlS?=
 =?utf-8?B?RnFVQk12QUFCWE44blc5c2tSOUFpV2w5NVM3SVpzSjBQaitzRitKeSt2ZkVm?=
 =?utf-8?B?RFEyVENzY0srdGxnaEN0dkVUSDg0c0NuaXA2THNYczErLzlxTjdCT3lZQ0Z4?=
 =?utf-8?B?SDBNWHFqNCs3WFlIRlhJOVY5K1ZPQWtmV2xmK3hVRCtlcWV5L0I3VDhCV25r?=
 =?utf-8?B?ZVk5WjlYZ1QvOUFkeWliZUt0ZCtQaW15Y2piOTVLU2NzWE9JbHgvUWtuMlRO?=
 =?utf-8?B?bXhENVB1MEFIaFNuZ1BBaDlXUTUxVHREVUMzVnU2OG4wN3JIUnRTTUsrS2tz?=
 =?utf-8?B?eStHUHE3Tm9iZGVVNTJGT3JvcUF3aFkxN3daem81cnhDYnlzUEREMjRrSHha?=
 =?utf-8?B?UmhlNkd3bVVmSkpJb05ZT2drSGVNcHVwLzZzTW5KQ2dZWlNvV21wZFNGMjdK?=
 =?utf-8?B?YVh6cVkzMXdIU0FqL29xek1SOW1OMXp1a0R0TTAwR1QxcUxkdm1SQi9MWVQw?=
 =?utf-8?B?amZmZVFmaVRDZGlPaDBhajFqWitIWldMZ0VxcFBDeGthcUVzeG9nV2xXV0JG?=
 =?utf-8?B?NHBMeVY3VmhGaU82SjEwU2o3ZlpTaFZMRVFKazh2d3VUVEhNaklvVVVHMEdR?=
 =?utf-8?B?aG9vdEdEQXhNQTdVNEF6TjY2bS9iQ1lBTDBxcWV5NURaQkJRVGZxdVJXcFRx?=
 =?utf-8?B?M2VVTytqRlF3cTdZQzBibFF3eFVETmdaWlVMa2t1RHJqa09vcHNYZXUwZmNq?=
 =?utf-8?B?a0JDQVE3Vm1yQlVCejVLT0txMTdTMVdqcTYvcVFUbktqcGJXRDNnL2NyVlRL?=
 =?utf-8?B?SnB5bXBidTd1QlRBR3VaSThrSmozTGRCRm9FcHlEQmt2UEdVUEZZNjRZcW1h?=
 =?utf-8?B?dW5MOEhmOEhWYnlyK01yRnFqU3hnSXdFVUtxWFY4dXNKeC95VVpFcVBnaURv?=
 =?utf-8?B?cmdXR0xjK1JLWlFJcnE2d2dpUnVjekJqcnVOdWpKKzVlWW1od2lMaC91b1ZE?=
 =?utf-8?B?V0J0SXM5Zk1FamdDS3pBaTMrVEFYQlNCWjhWYWJnODZwazh4RjVtSnR5QlI0?=
 =?utf-8?B?aU16Um42R2VSMUZ1L2YyOGFJVkk3ZDNDOTBrNWthTVBGWEhLcUdYNDNpMmNR?=
 =?utf-8?B?czJFVnRVM05LQWFoU1ovZ1BBeFBYTUgyV2JUVFBrNVBkUExqaXlUTXA5ZFFp?=
 =?utf-8?B?UTliR1B5N1AxdjFDVGFFUjlZazY1bFptb0F5WExTYldYOGpjdXJRKzZNL0VD?=
 =?utf-8?B?TXBUSlNCdFM5MS9KL0RXQzhPSVkrcU5QNkFPZFFrdGJyZ2lXcEU2ejFXRzlU?=
 =?utf-8?B?bGd1Y1o3YzBtUlJqQk9IRnhwWXF2aXBVaHUvaDBreHRMd1dJODhNeDRQNkE4?=
 =?utf-8?B?dkE3c1RzcHpCcEZ5b1JMdDNyMkFUNzIzTUwzTlpBNytscnlNKzdrcmt2Y3VX?=
 =?utf-8?B?MDdUaW1KYWVVOFJXRTNLWmdHUTRnTkIyY2JxRFVzK0dEMk1qSitGMEdMQThV?=
 =?utf-8?B?MXAxZ0NxSklXOUpNeHZ2aGhPdk9Zdmx5MHkyK0JrZkhqdThob3ZtWWNDcitJ?=
 =?utf-8?B?Q0JhbVdEWXEwQmQvVXNQbS9ISFI2V0ZIQ2o3VFkxS3ZhMEZtbzJRbGJ3aHJi?=
 =?utf-8?B?dyswTDlDaFBRajUyUVpVVFRjVnpjeFg5cjNPME9nalM2MmdNVE1kcUxuQjRu?=
 =?utf-8?B?clRCR1JIVURCUVI5RWZ3S3ZIYTFRdFA3TkF1SXJ6UUVYaDJhWUJ3aXNEdVcr?=
 =?utf-8?B?YVpwbGI5WEtBejQydEpTV01tR052OW5ZQ25kY2k3Y21Ja0FtcmxoTmF2Q3FW?=
 =?utf-8?B?S1dJOEIvRGxHUXBZRGVBd3hRTEUrWXMzN0dUbUFWOGFCWk9Zd1hTK0JtN2hw?=
 =?utf-8?Q?X4H01x6ruR+1M71P5/j+8HzooKspgv4yRq+/tf2QbQ=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ef18464-ac82-451c-e01e-08d9fb0053d0
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1947.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2022 21:21:47.7217
 (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: tERwQAyWTWfpiyCsOWAzp3/2chPDLtTzxw7L5j1PnlzvhNeeKwvuArhrew031PJ2bJPghv7ZBQz5KeFLQitJdw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3238
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

Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>

Andrey

On 2022-02-28 13:16, Melissa Wen wrote:
> Remove redundant error message (since now it is very similar to what
> we do in drm_sched_init) and centralize all error handling in a
> unique place, as we follow the same steps in any case of failure.
>
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   drivers/gpu/drm/v3d/v3d_sched.c | 40 +++++++++++----------------------
>   1 file changed, 13 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
> index 39459ae96f30..06238e6d7f5c 100644
> --- a/drivers/gpu/drm/v3d/v3d_sched.c
> +++ b/drivers/gpu/drm/v3d/v3d_sched.c
> @@ -392,34 +392,24 @@ v3d_sched_init(struct v3d_dev *v3d)
>   			     hw_jobs_limit, job_hang_limit,
>   			     msecs_to_jiffies(hang_limit_ms), NULL,
>   			     NULL, "v3d_bin", v3d->drm.dev);
> -	if (ret) {
> -		dev_err(v3d->drm.dev, "Failed to create bin scheduler: %d.", ret);
> +	if (ret)
>   		return ret;
> -	}
>   
>   	ret = drm_sched_init(&v3d->queue[V3D_RENDER].sched,
>   			     &v3d_render_sched_ops,
>   			     hw_jobs_limit, job_hang_limit,
>   			     msecs_to_jiffies(hang_limit_ms), NULL,
>   			     NULL, "v3d_render", v3d->drm.dev);
> -	if (ret) {
> -		dev_err(v3d->drm.dev, "Failed to create render scheduler: %d.",
> -			ret);
> -		v3d_sched_fini(v3d);
> -		return ret;
> -	}
> +	if (ret)
> +		goto fail;
>   
>   	ret = drm_sched_init(&v3d->queue[V3D_TFU].sched,
>   			     &v3d_tfu_sched_ops,
>   			     hw_jobs_limit, job_hang_limit,
>   			     msecs_to_jiffies(hang_limit_ms), NULL,
>   			     NULL, "v3d_tfu", v3d->drm.dev);
> -	if (ret) {
> -		dev_err(v3d->drm.dev, "Failed to create TFU scheduler: %d.",
> -			ret);
> -		v3d_sched_fini(v3d);
> -		return ret;
> -	}
> +	if (ret)
> +		goto fail;
>   
>   	if (v3d_has_csd(v3d)) {
>   		ret = drm_sched_init(&v3d->queue[V3D_CSD].sched,
> @@ -427,27 +417,23 @@ v3d_sched_init(struct v3d_dev *v3d)
>   				     hw_jobs_limit, job_hang_limit,
>   				     msecs_to_jiffies(hang_limit_ms), NULL,
>   				     NULL, "v3d_csd", v3d->drm.dev);
> -		if (ret) {
> -			dev_err(v3d->drm.dev, "Failed to create CSD scheduler: %d.",
> -				ret);
> -			v3d_sched_fini(v3d);
> -			return ret;
> -		}
> +		if (ret)
> +			goto fail;
>   
>   		ret = drm_sched_init(&v3d->queue[V3D_CACHE_CLEAN].sched,
>   				     &v3d_cache_clean_sched_ops,
>   				     hw_jobs_limit, job_hang_limit,
>   				     msecs_to_jiffies(hang_limit_ms), NULL,
>   				     NULL, "v3d_cache_clean", v3d->drm.dev);
> -		if (ret) {
> -			dev_err(v3d->drm.dev, "Failed to create CACHE_CLEAN scheduler: %d.",
> -				ret);
> -			v3d_sched_fini(v3d);
> -			return ret;
> -		}
> +		if (ret)
> +			goto fail;
>   	}
>   
>   	return 0;
> +
> +fail:
> +	v3d_sched_fini(v3d);
> +	return ret;
>   }
>   
>   void